diff --git a/ui/components/History.vue b/ui/components/History.vue
index fcc990b1..7bdcb2f9 100644
--- a/ui/components/History.vue
+++ b/ui/components/History.vue
@@ -75,7 +75,7 @@
     </div>
 
     <div class="columns is-multiline" v-if="'list' === display_style">
-      <div class="column is-12">
+      <div class="column is-12" v-if="hasItems">
         <div class="table-container">
           <table class="table is-striped is-hoverable is-fullwidth is-bordered" style="table-layout: fixed;">
             <thead>
diff --git a/ui/components/Queue.vue b/ui/components/Queue.vue
index e8218c60..5e104a12 100644
--- a/ui/components/Queue.vue
+++ b/ui/components/Queue.vue
@@ -34,7 +34,7 @@
     </div>
 
     <div class="columns is-multiline" v-if="'list' === display_style">
-      <div class="column is-12">
+      <div class="column is-12" v-if="hasQueuedItems">
         <div class="table-container">
           <table class="table is-striped is-hoverable is-fullwidth is-bordered" style="table-layout: fixed;">
             <thead>