diff --git a/apps/core/src/bootstrap/before-app.ts b/apps/core/src/bootstrap/before-app.ts
index 90c32168b6..c2ce057184 100644
--- a/apps/core/src/bootstrap/before-app.ts
+++ b/apps/core/src/bootstrap/before-app.ts
@@ -127,7 +127,7 @@ await rootStore
       const result = createFirst();
       console.info('create first workspace', result);
       localStorage.setItem('is-first-open', 'false');
-      rootStore.set(rootWorkspacesMetadataAtom, result).catch(console.error);
+      rootStore.set(rootWorkspacesMetadataAtom, result);
     }
   })
   .catch(console.error);
diff --git a/apps/core/src/providers/modal-provider.tsx b/apps/core/src/providers/modal-provider.tsx
index a34643ece6..de7088bb9f 100644
--- a/apps/core/src/providers/modal-provider.tsx
+++ b/apps/core/src/providers/modal-provider.tsx
@@ -8,13 +8,7 @@ import {
 } from '@toeverything/plugin-infra/atom';
 import { useAtom, useAtomValue, useSetAtom } from 'jotai';
 import type { FC, ReactElement } from 'react';
-import {
-  lazy,
-  startTransition,
-  Suspense,
-  useCallback,
-  useTransition,
-} from 'react';
+import { lazy, Suspense, useCallback, useTransition } from 'react';
 
 import type { SettingAtom } from '../atoms';
 import {
@@ -130,7 +124,7 @@ export const AllWorkspaceModals = (): ReactElement => {
     currentWorkspaceIdAtom
   );
   const setCurrentPageId = useSetAtom(currentPageIdAtom);
-  const [transitioning, transition] = useTransition();
+  const [isPending, startTransition] = useTransition();
   const [, setOpenSettingModalAtom] = useAtom(openSettingModalAtom);
 
   const handleOpenSettingModal = useCallback(
@@ -149,7 +143,7 @@ export const AllWorkspaceModals = (): ReactElement => {
     <>
       <Suspense>
         <WorkspaceListModal
-          disabled={transitioning}
+          disabled={isPending}
           workspaces={workspaces}
           currentWorkspaceId={currentWorkspaceId}
           open={
@@ -163,10 +157,10 @@ export const AllWorkspaceModals = (): ReactElement => {
             (activeId, overId) => {
               const oldIndex = workspaces.findIndex(w => w.id === activeId);
               const newIndex = workspaces.findIndex(w => w.id === overId);
-              transition(() => {
+              startTransition(() => {
                 setWorkspaces(workspaces =>
                   arrayMove(workspaces, oldIndex, newIndex)
-                ).catch(console.error);
+                );
               });
             },
             [setWorkspaces, workspaces]
diff --git a/packages/workspace/src/atom.ts b/packages/workspace/src/atom.ts
index 8cc7294130..2b09500d0b 100644
--- a/packages/workspace/src/atom.ts
+++ b/packages/workspace/src/atom.ts
@@ -60,9 +60,9 @@ export const workspaceAdaptersAtom = atom<
  * which is `id` and `flavor`, that is enough to load the real workspace data
  */
 const METADATA_STORAGE_KEY = 'jotai-workspaces';
-const rootWorkspacesMetadataPrimitiveAtom = atom<
-  RootWorkspaceMetadata[] | null
->(null);
+const rootWorkspacesMetadataPrimitiveAtom = atom<Promise<
+  RootWorkspaceMetadata[]
+> | null>(null);
 const rootWorkspacesMetadataPromiseAtom = atom<
   Promise<RootWorkspaceMetadata[]>
 >(async (get, { signal }) => {
@@ -168,7 +168,7 @@ type SetStateAction<Value> = Value | ((prev: Value) => Value);
 export const rootWorkspacesMetadataAtom = atom<
   Promise<RootWorkspaceMetadata[]>,
   [SetStateAction<RootWorkspaceMetadata[]>],
-  Promise<RootWorkspaceMetadata[]>
+  void
 >(
   async get => {
     const maybeMetadata = get(rootWorkspacesMetadataPrimitiveAtom);
@@ -178,29 +178,26 @@ export const rootWorkspacesMetadataAtom = atom<
     return get(rootWorkspacesMetadataPromiseAtom);
   },
   async (get, set, action) => {
+    const metadataPromise = get(rootWorkspacesMetadataPromiseAtom);
     // get metadata
-    let metadata: RootWorkspaceMetadata[];
-    const maybeMetadata = get(rootWorkspacesMetadataPrimitiveAtom);
-    if (maybeMetadata !== null) {
-      metadata = maybeMetadata;
-    } else {
-      metadata = await get(rootWorkspacesMetadataPromiseAtom);
-    }
+    set(rootWorkspacesMetadataPrimitiveAtom, async maybeMetadataPromise => {
+      let metadata: RootWorkspaceMetadata[] =
+        (await maybeMetadataPromise) ?? (await metadataPromise);
 
-    // update metadata
-    if (typeof action === 'function') {
-      metadata = action(metadata);
-    } else {
-      metadata = action;
-    }
+      // update metadata
+      if (typeof action === 'function') {
+        metadata = action(metadata);
+      } else {
+        metadata = action;
+      }
 
-    const metadataMap = new Map(metadata.map(x => [x.id, x]));
-    metadata = Array.from(metadataMap.values());
-    // write back to localStorage
-    rootWorkspaceMetadataArraySchema.parse(metadata);
-    localStorage.setItem(METADATA_STORAGE_KEY, JSON.stringify(metadata));
-    set(rootWorkspacesMetadataPrimitiveAtom, metadata);
-    return metadata;
+      const metadataMap = new Map(metadata.map(x => [x.id, x]));
+      metadata = Array.from(metadataMap.values());
+      // write back to localStorage
+      rootWorkspaceMetadataArraySchema.parse(metadata);
+      localStorage.setItem(METADATA_STORAGE_KEY, JSON.stringify(metadata));
+      return metadata;
+    });
   }
 );