diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue b/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue
index dad3ac8..28163e8 100644
--- a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue
+++ b/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue
@@ -10,10 +10,12 @@
       sort-icon-left
       no-sort-reset
       responsive="md"
+      show-empty
       :items="processors"
       :fields="fields"
       :sort-desc="true"
       :filter="searchFilter"
+      :empty-text="$t('global.table.emptyMessage')"
     >
       <!-- Expand button -->
       <template v-slot:cell(expandRow)="row">
diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue
index 5c86263..391fb05 100644
--- a/src/views/Overview/OverviewEvents.vue
+++ b/src/views/Overview/OverviewEvents.vue
@@ -1,34 +1,31 @@
 <template>
   <div>
-    <div v-if="eventLogData.length == 0">
-      {{ $t('pageOverview.events.noHighEventsMsg') }}
-    </div>
-    <div v-else>
-      <b-button
-        variant="link"
-        to="/health/event-logs"
-        data-test-id="overviewEvents-button-eventLogs"
-        class="float-md-right"
-      >
-        {{ $t('pageOverview.events.viewAllButton') }}
-      </b-button>
-      <b-table
-        per-page="5"
-        sort-by="date"
-        sort-desc
-        responsive="md"
-        :items="eventLogData"
-        :fields="fields"
-      >
-        <template v-slot:cell(severity)="{ value }">
-          <status-icon status="danger" />
-          {{ value }}
-        </template>
-        <template v-slot:cell(date)="{ value }">
-          {{ value | formatDate }} {{ value | formatTime }}
-        </template>
-      </b-table>
-    </div>
+    <b-button
+      variant="link"
+      to="/health/event-logs"
+      data-test-id="overviewEvents-button-eventLogs"
+      class="float-md-right"
+    >
+      {{ $t('pageOverview.events.viewAllButton') }}
+    </b-button>
+    <b-table
+      per-page="5"
+      sort-by="date"
+      sort-desc
+      responsive="md"
+      show-empty
+      :items="eventLogData"
+      :fields="fields"
+      :empty-text="$t('pageOverview.events.noHighEventsMsg')"
+    >
+      <template v-slot:cell(severity)="{ value }">
+        <status-icon status="danger" />
+        {{ value }}
+      </template>
+      <template v-slot:cell(date)="{ value }">
+        {{ value | formatDate }} {{ value | formatTime }}
+      </template>
+    </b-table>
   </div>
 </template>