diff --git a/wherehows-web/app/templates/components/datasets/containers/dataset-health.hbs b/wherehows-web/app/templates/components/datasets/containers/dataset-health.hbs
index d0d0f0b552..2c825890cd 100644
--- a/wherehows-web/app/templates/components/datasets/containers/dataset-health.hbs
+++ b/wherehows-web/app/templates/components/datasets/containers/dataset-health.hbs
@@ -1,12 +1,12 @@
 <h3>Metadata Health</h3>
-{{#unless tableData.length}}
+{{#if shouldShowDatasetHealth}}
   {{datasets/health/metrics-charts
     isActiveTab=isActiveTab
     categoryData=renderedCategories
     severityData=renderedSeverity
     onCategorySelect=(action onFilterSelect "category")
     onSeveritySelect=(action onFilterSelect "severity")}}
-{{/unless}}
+{{/if}}
 {{datasets/health/score-table
   tableData=tableData
   currentCategoryFilter=currentCategoryFilter
diff --git a/wherehows-web/app/templates/datasets/dataset.hbs b/wherehows-web/app/templates/datasets/dataset.hbs
index 4b712a9b7f..6a6482a47b 100644
--- a/wherehows-web/app/templates/datasets/dataset.hbs
+++ b/wherehows-web/app/templates/datasets/dataset.hbs
@@ -56,28 +56,19 @@
             </div>
           {{/datasets/containers/dataset-fabrics}}
 
-          {{#if shouldShowDatasetHealth}}
-            {{datasets/containers/dataset-owner-list
-              urn=encodedUrn
-              avatarEntityProps=avatarEntityProps
-              class="dataset-owner-list"}}
+          {{datasets/containers/dataset-owner-list
+            urn=encodedUrn
+            avatarEntityProps=avatarEntityProps
+            class="dataset-owner-list"}}
 
-            {{#link-to "datasets.dataset.health" encodedUrn}}
-              {{datasets/containers/health-score-gauge urn=encodedUrn wikiLinks=wikiLinks}}
-            {{/link-to}}
-          {{/if}}
+          {{#link-to "datasets.dataset.health" encodedUrn}}
+            {{datasets/containers/health-score-gauge urn=encodedUrn wikiLinks=wikiLinks}}
+          {{/link-to}}
         </div>
 
       </div>
     </div>
 
-    {{#unless shouldShowDatasetHealth}}
-      {{datasets/containers/dataset-owner-list
-        urn=encodedUrn
-        avatarEntityProps=avatarEntityProps
-      }}
-    {{/unless}}
-
   </div>
 </div>
 
@@ -120,11 +111,9 @@
           {{/tablist.tab}}
         {{/if}}
 
-        {{#if shouldShowDatasetHealth}}
-          {{#tablist.tab tabIds.Health on-select=(action "tabSelectionChanged")}}
-            Health
-          {{/tablist.tab}}
-        {{/if}}
+        {{#tablist.tab tabIds.Health on-select=(action "tabSelectionChanged")}}
+          Health
+        {{/tablist.tab}}
 
       {{/tabs.tablist}}
     </div>
@@ -179,10 +168,12 @@
       {{/tabs.tabpanel}}
     {{/if}}
 
-    {{#if shouldShowDatasetHealth}}
-      {{#tabs.tabpanel tabIds.Health}}
-        {{datasets/containers/dataset-health urn=encodedUrn tabSelected=tabSelected}}
-      {{/tabs.tabpanel}}
-    {{/if}}
+    {{#tabs.tabpanel tabIds.Health}}
+      {{datasets/containers/dataset-health
+        urn=encodedUrn
+        tabSelected=tabSelected
+        shouldShowDatasetHealth=shouldShowDatasetHealth
+      }}
+    {{/tabs.tabpanel}}
   </div>
 {{/ivy-tabs}}