diff --git a/plugins/workbench-resources/src/components/AccountPopup.svelte b/plugins/workbench-resources/src/components/AccountPopup.svelte
index 74aa7c4f87..575960ab71 100644
--- a/plugins/workbench-resources/src/components/AccountPopup.svelte
+++ b/plugins/workbench-resources/src/components/AccountPopup.svelte
@@ -16,7 +16,6 @@
   import contact, { Employee, EmployeeAccount, formatName } from '@hcengineering/contact'
   import { AccountRole, getCurrentAccount } from '@hcengineering/core'
   import login from '@hcengineering/login'
-  import { getWorkspaces, Workspace } from '@hcengineering/login-resources'
   import { setMetadata } from '@hcengineering/platform'
   import { Avatar, createQuery } from '@hcengineering/presentation'
   import setting, { settingId, SettingsCategory } from '@hcengineering/setting'
@@ -34,15 +33,9 @@
   import view from '@hcengineering/view'
   import HelpAndSupport from './HelpAndSupport.svelte'
   import workbench from '../plugin'
-  import { onMount } from 'svelte'
   import SelectWorkspaceMenu from './SelectWorkspaceMenu.svelte'
 
   let items: SettingsCategory[] = []
-  let workspaces: Workspace[] = []
-
-  onMount(() => {
-    getWorkspaces().then((ws: Workspace[]) => (workspaces = ws))
-  })
 
   const settingsQuery = createQuery()
   settingsQuery.query(
@@ -152,7 +145,6 @@
         label: setting.string.SelectWorkspace,
         action: async () => {},
         component: SelectWorkspaceMenu,
-        props: { workspaces },
         group: 'end'
       },
       {
diff --git a/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte b/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
index cee1484f53..eb29bbaaf2 100644
--- a/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
+++ b/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
@@ -14,13 +14,26 @@
 -->
 <script lang="ts">
   import login from '@hcengineering/login'
-  import { navigateToWorkspace, selectWorkspace, setLoginInfo, Workspace } from '@hcengineering/login-resources'
+  import {
+    getWorkspaces,
+    navigateToWorkspace,
+    selectWorkspace,
+    setLoginInfo,
+    Workspace
+  } from '@hcengineering/login-resources'
   import { getEmbeddedLabel } from '@hcengineering/platform'
   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(() => {
+    getWorkspaces().then((ws: Workspace[]) => {
+      workspaces = ws
+    })
+  })
 
   $: actions = [
     ...workspaces.map((w) => ({