diff --git a/plugins/login-resources/src/utils.ts b/plugins/login-resources/src/utils.ts
index b4ce288d0a..7c32e569d2 100644
--- a/plugins/login-resources/src/utils.ts
+++ b/plugins/login-resources/src/utils.ts
@@ -277,7 +277,6 @@ export async function selectWorkspace (workspace: string): Promise<[Status, Work
 }
 
 export function setLoginInfo (loginInfo: WorkspaceLoginInfo): void {
-  setMetadata(login.metadata.LoginToken, loginInfo.token)
   const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
   tokens[loginInfo.workspace] = loginInfo.token
 
@@ -290,6 +289,7 @@ export function navigateToWorkspace (workspace: string, loginInfo?: WorkspaceLog
   if (loginInfo == null) {
     return
   }
+  setMetadata(login.metadata.LoginToken, loginInfo.token)
   setLoginInfo(loginInfo)
 
   if (navigateUrl !== undefined) {
diff --git a/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte b/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
index e24106ca10..cee1484f53 100644
--- a/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
+++ b/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
@@ -14,33 +14,16 @@
 -->
 <script lang="ts">
   import login from '@hcengineering/login'
-  import {
-    getWorkspaces,
-    selectWorkspace,
-    Workspace,
-    navigateToWorkspace,
-    setLoginInfo
-  } from '@hcengineering/login-resources'
+  import { navigateToWorkspace, selectWorkspace, setLoginInfo, Workspace } from '@hcengineering/login-resources'
   import { getEmbeddedLabel } from '@hcengineering/platform'
-  import { navigate, Menu, locationToUrl } from '@hcengineering/ui'
+  import { Loading, locationToUrl, Menu, navigate } from '@hcengineering/ui'
   import { workbenchId } from '@hcengineering/workbench'
-  import { onMount } from 'svelte'
   import workbench from '../plugin'
 
   export let workspaces: Workspace[]
 
-  let _workspaces: Workspace[] = []
-
-  onMount(() => {
-    if (workspaces.length === 0) {
-      getWorkspaces().then((ws: Workspace[]) => (_workspaces = ws))
-    } else {
-      _workspaces = workspaces
-    }
-  })
-
   $: actions = [
-    ..._workspaces.map((w) => ({
+    ...workspaces.map((w) => ({
       label: getEmbeddedLabel(w.workspace),
       action: async () => {
         const loginInfo = (await selectWorkspace(w.workspace))[1]
@@ -76,4 +59,8 @@
   ]
 </script>
 
-<Menu {actions} on:close />
+{#if workspaces.length}
+  <Menu {actions} on:close />
+{:else}
+  <Loading />
+{/if}