diff --git a/src/components/OrgOverview.svelte b/src/components/OrgOverview.svelte
index a66540e0..f22ddb3a 100644
--- a/src/components/OrgOverview.svelte
+++ b/src/components/OrgOverview.svelte
@@ -7,18 +7,24 @@
   $: searchvalue = "";
   $: active_deletes = [];
   export let current_organizations = [];
+
+  const promise = RunnerOrganisationService.runnerOrganisationControllerGetAll().then(
+    (val) => {
+      current_organizations = val;
+    }
+  );
 </script>
 
 {#if store.state.jwtinfo.userdetails.permissions.includes('ORGANISATION:GET')}
-  {#await RunnerOrganisationService.runnerOrganisationControllerGetAll()}
+  {#await promise}
     <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">
       <p class="font-bold">organizations are being loaded...</p>
       <p class="text-sm">{$_('this-might-take-a-moment')}</p>
     </div>
-  {:then orgs}
-    {#if orgs.length === 0}
+  {:then}
+    {#if current_organizations.length === 0}
       <OrgsEmptyState />
     {:else}
       <input
@@ -53,7 +59,7 @@
             </tr>
           </thead>
           <tbody class="divide-y divide-gray-200">
-            {#each orgs as o}
+            {#each current_organizations as o}
               {#if Object.values(o)
                 .toString()
                 .toLowerCase()