diff --git a/components/TorrustSelect.vue b/components/TorrustSelect.vue
index 613b9231..e1535ce5 100644
--- a/components/TorrustSelect.vue
+++ b/components/TorrustSelect.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="group dropdown" :class="dropdownAlignment">
-    <div tabindex="0" class="items-center duration-200 select select-bordered group-hover:border-amber-500" :class="{ 'h-[3.5rem]': !!label }">
+    <div
+      tabindex="0"
+      class="items-center duration-200 select select-bordered group-hover:border-amber-500"
+      :class="{ 'h-[3.5rem]': !!label }"
+    >
       <div class="flex flex-col mr-1 text-left capitalize flex-nowrap">
         <span v-if="label" class="text-xs text-primary">{{ label }}</span>
         <div class="flex flex-row text-sm flex-nowrap">
@@ -10,7 +14,11 @@
         </div>
       </div>
     </div>
-    <div ref="dropdownContent" tabindex="0" class="flex flex-col gap-2 p-2 mt-3 border rounded-lg shadow dropdown-content border-base-content/20 bg-base-100 z-[1]">
+    <div
+      ref="dropdownContent"
+      tabindex="0"
+      class="flex flex-col gap-2 p-2 mt-3 border rounded-lg shadow dropdown-content border-base-content/20 bg-base-100 z-[1]"
+    >
       <template v-if="props.search">
         <div class="">
           <input
@@ -34,14 +42,8 @@
                 {{ option.name }}
               </div>
               <div v-if="props.multiple" class="flex flex-col items-center ml-auto">
-                <span
-                  v-if="isSelectedOption(option)"
-                  class="relative inline-flex"
-                >
-                  <input
-                    type="checkbox"
-                    class="w-6 h-6 border-2 rounded-md appearance-none bg-primary border-primary"
-                  >
+                <span v-if="isSelectedOption(option)" class="relative inline-flex">
+                  <input type="checkbox" class="w-6 h-6 border-2 rounded-md appearance-none bg-primary border-primary">
                   <CheckIcon
                     class="absolute w-5 text-neutral-content"
                     style="top: 50%;left: 50%;transform: translate(-50%, -50%);"
@@ -179,6 +181,4 @@ const dropdownAlignment = computed(() => {
 
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/cypress/e2e/contexts/torrent/specs/list/no_torrents_to_display.cy.ts b/cypress/e2e/contexts/torrent/specs/list/no_torrents_to_display.cy.ts
index a0595784..0e53c80e 100644
--- a/cypress/e2e/contexts/torrent/specs/list/no_torrents_to_display.cy.ts
+++ b/cypress/e2e/contexts/torrent/specs/list/no_torrents_to_display.cy.ts
@@ -7,6 +7,6 @@ describe("Users", () => {
   it("Should be able to see the list page when there are no torrents", () => {
     cy.visit("/torrents");
     cy.url().should("match", /\/torrents$/);
-    cy.get("[data-cy=\"no-results-element\"]").invoke("text").should("match", /No results./i);
+    cy.get("[data-cy=\"no-results-element\"] img").should("have.attr", "src", "/spinner.gif");
   });
 });
diff --git a/pages/torrents.vue b/pages/torrents.vue
index 719392ea..776c96c6 100644
--- a/pages/torrents.vue
+++ b/pages/torrents.vue
@@ -28,7 +28,12 @@
         <button class="tab" :class="{ 'tab-active': layout === 'default' }" @click="layout = 'default'">
           Default
         </button>
-        <button data-cy="torrents-table-layout-selector" class="tab" :class="{ 'tab-active': layout === 'table' }" @click="layout = 'table'">
+        <button
+          data-cy="torrents-table-layout-selector"
+          class="tab"
+          :class="{ 'tab-active': layout === 'table' }"
+          @click="layout = 'table'"
+        >
           Table
         </button>
       </div>
@@ -43,10 +48,16 @@
             <template v-else-if="layout === 'table'">
               <TorrentTable :torrents="torrents" />
             </template>
-            <Pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :total-results="torrentsTotal" />
+            <Pagination
+              v-model:current-page="currentPage"
+              v-model:page-size="pageSize"
+              :total-results="torrentsTotal"
+            />
           </template>
           <template v-else>
-            <span data-cy="no-results-element" class="text-neutral-content">No results.</span>
+            <span data-cy="no-results-element" class="text-neutral-content flex items-center justify-center">
+              <img src="/spinner.gif" class="w-20 h-20" alt="Loading Spinner">
+            </span>
           </template>
         </div>
       </div>
@@ -154,6 +165,4 @@ function loadTorrents () {
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/public/spinner.gif b/public/spinner.gif
new file mode 100644
index 00000000..11a091a2
Binary files /dev/null and b/public/spinner.gif differ