diff --git a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
index 44fcdca7b90..abb6ead7a29 100644
--- a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
+++ b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
@@ -57,7 +57,10 @@ export const useDriveResolver = (options: DriveResolverOptions = {}): DriveResol
 
   // clean up global state as the watchers aren't triggered anymore when navigating away
   onUnmounted(() => {
-    spacesStore.setCurrentSpace(null)
+    const driveAliasAndItem = unref(options.driveAliasAndItem)
+    if (!driveAliasAndItem?.startsWith('personal/') && !driveAliasAndItem?.startsWith('project/')) {
+      spacesStore.setCurrentSpace(null)
+    }
   })
 
   watch(