diff --git a/ui-v2/app/templates/dc/nodes/-rtt.hbs b/ui-v2/app/templates/dc/nodes/-rtt.hbs
index ff64e3a47a..429eead2d5 100644
--- a/ui-v2/app/templates/dc/nodes/-rtt.hbs
+++ b/ui-v2/app/templates/dc/nodes/-rtt.hbs
@@ -3,19 +3,19 @@
         Minimum
     </dt>
     <dd>
-        {{ format-number tomography.min maximumFractionDigits=2}}ms
+        {{format-number tomography.min maximumFractionDigits=2}}ms
     </dd>
     <dt>
         Median
     </dt>
     <dd>
-        {{ format-number tomography.median maximumFractionDigits=2}}ms
+        {{format-number tomography.median maximumFractionDigits=2}}ms
     </dd>
     <dt>
         Maximum
     </dt>
     <dd>
-        {{ format-number tomography.max maximumFractionDigits=2}}ms
+        {{format-number tomography.max maximumFractionDigits=2}}ms
     </dd>
 </dl>
 {{tomography-graph tomography=tomography}}
diff --git a/ui-v2/app/templates/dc/nodes/show.hbs b/ui-v2/app/templates/dc/nodes/show.hbs
index e2b69aefea..0823e3a7dd 100644
--- a/ui-v2/app/templates/dc/nodes/show.hbs
+++ b/ui-v2/app/templates/dc/nodes/show.hbs
@@ -48,19 +48,19 @@
     {{/block-slot}}
     {{#block-slot name='content'}}
         {{#each
-            (compact
-                (array
-                            (hash id=(slugify 'Health Checks') partial='dc/nodes/healthchecks')
-                            (hash id=(slugify 'Services') partial='dc/nodes/services')
-   (if tomography.distances (hash id=(slugify 'Round Trip Time') partial='dc/nodes/rtt') '')
-                            (hash id=(slugify 'Lock Sessions') partial='dc/nodes/sessions')
-                            (hash id=(slugify 'Meta Data') partial='dc/nodes/metadata')
-                )
+            (array
+              (hash id=(slugify 'Health Checks') partial='dc/nodes/healthchecks')
+              (hash id=(slugify 'Services') partial='dc/nodes/services')
+              (hash id=(slugify 'Round Trip Time') partial='dc/nodes/rtt')
+              (hash id=(slugify 'Lock Sessions') partial='dc/nodes/sessions')
+              (hash id=(slugify 'Meta Data') partial='dc/nodes/metadata')
             ) as |panel|
         }}
+    {{#if (or (not-eq panel.id 'round-trip-time') (gt tomography.distances.length 0)) }}
             {{#tab-section id=panel.id selected=(eq (if selectedTab selectedTab '') panel.id) onchange=(action "change")}}
                 {{partial panel.partial}}
             {{/tab-section}}
+    {{/if}}
         {{/each}}
     {{/block-slot}}
 {{/app-view}}