diff --git a/ui/app/pages/presets.vue b/ui/app/pages/presets.vue
index bb177a9a..cfd7aea9 100644
--- a/ui/app/pages/presets.vue
+++ b/ui/app/pages/presets.vue
@@ -73,7 +73,7 @@
     </div>
 
     <template v-if="!toggleForm">
-      <div class="columns is-multiline" v-if="presetsNoDefault && presetsNoDefault.length > 0">
+      <div class="columns is-multiline" v-if="!isLoading && presetsNoDefault && presetsNoDefault.length > 0">
         <template v-if="'list' === display_style">
           <div class="column is-12">
             <div class="table-container">
@@ -218,13 +218,14 @@
         </template>
       </div>
 
-      <div class="columns is-multiline" v-if="!toggleForm && (!filteredPresets || filteredPresets.length < 1)">
+      <div class="columns is-multiline"
+        v-if="!toggleForm && (isLoading || !filteredPresets || filteredPresets.length < 1)">
         <div class="column is-12">
           <Message v-if="isLoading" class="is-info" title="Loading" icon="fas fa-spinner fa-spin">
             Loading data. Please wait...
           </Message>
-          <Message title="No Results" class="is-warning" icon="fas fa-search" v-else-if="query"
-            :useClose="true" @close="query = ''">
+          <Message title="No Results" class="is-warning" icon="fas fa-search" v-else-if="query" :useClose="true"
+            @close="query = ''">
             <p>No results found for the query: <code>{{ query }}</code>.</p>
             <p>Please try a different search term.</p>
           </Message>
diff --git a/ui/app/pages/tasks.vue b/ui/app/pages/tasks.vue
index 7006cef5..b1db3594 100644
--- a/ui/app/pages/tasks.vue
+++ b/ui/app/pages/tasks.vue
@@ -407,13 +407,13 @@
       </div>
     </div>
 
-    <div class="columns is-multiline" v-if="!toggleForm && (!filteredTasks || filteredTasks.length < 1)">
+    <div class="columns is-multiline" v-if="!toggleForm && (isLoading || !filteredTasks || filteredTasks.length < 1)">
       <div class="column is-12">
         <Message class="is-info" title="Loading" icon="fas fa-spinner fa-spin" v-if="isLoading">
           Loading data. Please wait...
         </Message>
-        <Message title="No Results" class="is-warning" icon="fas fa-search" v-else-if="query"
-          :useClose="true" @close="query = ''">
+        <Message title="No Results" class="is-warning" icon="fas fa-search" v-else-if="query" :useClose="true"
+          @close="query = ''">
           <p>No results found for the query: <code>{{ query }}</code>.</p>
           <p>Please try a different search term.</p>
         </Message>