diff --git a/src/components/scans/ScansOverview.svelte b/src/components/scans/ScansOverview.svelte
index f19f5e1a..35b05bc6 100644
--- a/src/components/scans/ScansOverview.svelte
+++ b/src/components/scans/ScansOverview.svelte
@@ -30,6 +30,7 @@
     $table?.getSelectedRowModel().rows.map((row) => row.index) || [];
 
   $: active_delete = undefined;
+  $: dataLoaded = false;
   export let current_scans = [];
   export const addScans = (scans) => {
     current_scans = current_scans.concat(...scans);
@@ -39,15 +40,6 @@
     }));
   };
 
-  const scans_promise = ScanService.scanControllerGetAll().then((val) => {
-    current_scans = val;
-    // handler.setRows(val);
-    current_scans = val;
-    options.update((options) => ({
-      ...options,
-      data: current_scans,
-    }));
-  });
   let allTracks = [];
   TrackService.trackControllerGetAll().then((val) => {
     allTracks = val;
@@ -99,7 +91,7 @@
       accessorKey: "timestamp",
       header: () => $_("timestamp"),
       cell: (info) => {
-        return (new Date(parseInt(info.getValue())*1000)).toLocaleString()
+        return new Date(parseInt(info.getValue()) * 1000).toLocaleString();
       },
       enableColumnFilter: false,
     },
@@ -183,6 +175,29 @@
       backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
     }).showToast();
   }
+
+  onMount(async () => {
+    let page = 0;
+    while (page >= 0) {
+      const scans = await ScanService.scanControllerGetAll(page, 500);
+      if (scans.length == 0) {
+        page = -2;
+        dataLoaded = true;
+      }
+
+      current_scans = current_scans.concat(...scans);
+      options.update((options) => ({
+        ...options,
+        data: current_scans,
+      }));
+
+      if (page == 0) {
+        dataLoaded = true;
+      }
+      page++;
+    }
+    console.log("All scans loaded");
+  });
 </script>
 
 <DeleteScanModal
@@ -193,7 +208,7 @@
   }}
 />
 {#if store.state.jwtinfo.userdetails.permissions.includes("SCAN:GET")}
-  {#await scans_promise}
+  {#if !dataLoaded}
     <div
       class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
       role="alert"
@@ -201,105 +216,96 @@
       <p class="font-bold">{$_("scans-are-being-loaded")}</p>
       <p class="text-sm">{$_("this-might-take-a-moment")}</p>
     </div>
-  {:then}
-    {#if current_scans.length === 0}
-      <ScansEmptyState />
-    {:else}
-      {#if selected.length > 0}
-        <button
-          type="button"
-          class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
-          id="options-menu"
-          on:click={async () => {
-            const prom = [];
-            for (const scan of selectedScans) {
-              prom.push(ScanService.scanControllerRemove(scan.id, true));
-            }
-            await Promise.all(prom);
-            for (const scan of selectedScans) {
-              current_scans = current_scans.filter((r) => r.id !== scan.id);
-            }
-            options.update((options) => ({
-              ...options,
-              data: current_scans,
-            }));
-            $table.resetRowSelection();
-            Toastify({
-              text: $_("scan-deleted"),
-              duration: 3500,
-              backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
-            }).showToast();
-          }}
+  {:else if current_scans.length === 0}
+    <ScansEmptyState />
+  {:else}
+    {#if selected.length > 0}
+      <button
+        type="button"
+        class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
+        id="options-menu"
+        on:click={async () => {
+          const prom = [];
+          for (const scan of selectedScans) {
+            prom.push(ScanService.scanControllerRemove(scan.id, true));
+          }
+          await Promise.all(prom);
+          for (const scan of selectedScans) {
+            current_scans = current_scans.filter((r) => r.id !== scan.id);
+          }
+          options.update((options) => ({
+            ...options,
+            data: current_scans,
+          }));
+          $table.resetRowSelection();
+          Toastify({
+            text: $_("scan-deleted"),
+            duration: 3500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
+        }}
+      >
+        {$_("delete-scans")}
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke-width="1.5"
+          stroke="currentColor"
+          class="w-5 h-5"
         >
-          {$_("delete-scans")}
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke-width="1.5"
-            stroke="currentColor"
-            class="w-5 h-5"
-          >
-            <path
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
-            />
-          </svg>
-        </button>
-      {/if}
-      <div class="overflow-x-auto">
-        <table class="w-full">
-          <thead>
-            {#each $table.getHeaderGroups() as headerGroup}
-              <tr class="select-none">
-                <th class="inset-y-0 left-0 px-4 py-2 text-left w-px">
-                  <InputElement
-                    type="checkbox"
-                    checked={$table.getIsAllRowsSelected()}
-                    indeterminate={$table.getIsSomeRowsSelected()}
-                    on:change={() => $table.toggleAllRowsSelected()}
-                  />
-                </th>
-                {#each headerGroup.headers as header}
-                  <TableHeader {header} />
-                {/each}
-              </tr>
-            {/each}
-          </thead>
-          <tbody>
-            {#each $table.getRowModel().rows as row}
-              <tr>
-                <td class="inset-y-0 left-0 px-4 py-2 text-center w-px">
-                  <InputElement
-                    type="checkbox"
-                    checked={row.getIsSelected()}
-                    on:change={() => row.toggleSelected()}
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
+          />
+        </svg>
+      </button>
+    {/if}
+    <div class="overflow-x-auto">
+      <table class="w-full">
+        <thead>
+          {#each $table.getHeaderGroups() as headerGroup}
+            <tr class="select-none">
+              <th class="inset-y-0 left-0 px-4 py-2 text-left w-px">
+                <InputElement
+                  type="checkbox"
+                  checked={$table.getIsAllRowsSelected()}
+                  indeterminate={$table.getIsSomeRowsSelected()}
+                  on:change={() => $table.toggleAllRowsSelected()}
+                />
+              </th>
+              {#each headerGroup.headers as header}
+                <TableHeader {header} />
+              {/each}
+            </tr>
+          {/each}
+        </thead>
+        <tbody>
+          {#each $table.getRowModel().rows as row}
+            <tr>
+              <td class="inset-y-0 left-0 px-4 py-2 text-center w-px">
+                <InputElement
+                  type="checkbox"
+                  checked={row.getIsSelected()}
+                  on:change={() => row.toggleSelected()}
+                />
+              </td>
+              {#each row.getVisibleCells() as cell}
+                <td>
+                  <svelte:component
+                    this={flexRender(
+                      cell.column.columnDef.cell,
+                      cell.getContext()
+                    )}
                   />
                 </td>
-                {#each row.getVisibleCells() as cell}
-                  <td>
-                    <svelte:component
-                      this={flexRender(
-                        cell.column.columnDef.cell,
-                        cell.getContext()
-                      )}
-                    />
-                  </td>
-                {/each}
-              </tr>
-            {/each}
-          </tbody>
-        </table>
-      </div>
-      <TableBottom {table} {selected} />
-    {/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">
-        <b class="capitalize">{$_("general_promise_error")}</b>
-        {error}
-      </span>
+              {/each}
+            </tr>
+          {/each}
+        </tbody>
+      </table>
     </div>
-  {/await}
+    <TableBottom {table} {selected} />
+  {/if}
 {/if}