diff --git a/src/components/Tracks.svelte b/src/components/Tracks.svelte
index bad8d43e..46d549b3 100644
--- a/src/components/Tracks.svelte
+++ b/src/components/Tracks.svelte
@@ -76,8 +76,6 @@
 
 {#if trackscache.length > 0}
   <div bind:this={table} />
-{:else}
-  <TracksEmptyState />
 {/if}
 {#await tracks_promise}
   <div
@@ -86,6 +84,10 @@
     <p class="font-bold">{$_('track-data-is-being-loaded')}</p>
     <p class="text-sm">{$_('this-might-take-a-moment')}</p>
   </div>
+{:then}
+  {#if trackscache.length === 0}
+    <TracksEmptyState />
+  {/if}
 {:catch error}
   <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
     <span class="inline-block align-middle mr-8">