diff --git a/ui/app/components/primary-metric/current-value.hbs b/ui/app/components/primary-metric/current-value.hbs
index 60ae3d61d..dbc102a05 100644
--- a/ui/app/components/primary-metric/current-value.hbs
+++ b/ui/app/components/primary-metric/current-value.hbs
@@ -4,7 +4,7 @@
       <progress
         data-test-current-value
         class="progress {{@chartClass}} is-small"
-        value="{{@percent}}"
+        value="{{or @percent 0}}"
         max="1">
         {{@percent}}
       </progress>
diff --git a/ui/app/templates/clients/client/index.hbs b/ui/app/templates/clients/client/index.hbs
index 471a799e6..320bf7a33 100644
--- a/ui/app/templates/clients/client/index.hbs
+++ b/ui/app/templates/clients/client/index.hbs
@@ -470,23 +470,25 @@
         @attributePairs={{this.model.attributes.structured}}
         @class="attributes-table" />
     </div>
-    <div class="boxed-section-head">
-      Meta
     </div>
-    {{#if this.model.meta.structured}}
-      <div class="boxed-section-body is-full-bleed">
-        <AttributesTable
-          data-test-meta
-          @attributePairs={{this.model.meta.structured}}
-          @class="attributes-table" />
+    <div class="boxed-section">
+      <div class="boxed-section-head">
+        Meta
       </div>
-    {{else}}
-      <div class="boxed-section-body">
-        <div data-test-empty-meta-message class="empty-message">
-          <h3 class="empty-message-headline">No Meta Attributes</h3>
-          <p class="empty-message-body">This client is configured with no meta attributes.</p>
+      {{#if this.model.meta.structured}}
+        <div class="boxed-section-body is-full-bleed">
+          <AttributesTable
+            data-test-meta
+            @attributePairs={{this.model.meta.structured}}
+            @class="attributes-table" />
         </div>
-      </div>
-    {{/if}}
+      {{else}}
+        <div class="boxed-section-body">
+          <div data-test-empty-meta-message class="empty-message">
+            <h3 class="empty-message-headline">No Meta Attributes</h3>
+            <p class="empty-message-body">This client is configured with no meta attributes.</p>
+          </div>
+        </div>
+      {{/if}}
   </div>
 </section>