diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index 8a7d51b60a..ff99b38fe3 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -782,7 +782,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         // restore selected state from last session if any and still valid
         const lastSpaceId = window.localStorage.getItem(ACTIVE_SPACE_LS_KEY);
         if (lastSpaceId) {
-            this.setActiveSpace(this.matrixClient.getRoom(lastSpaceId));
+            // don't context switch here as it may break permalinks
+            this.setActiveSpace(this.matrixClient.getRoom(lastSpaceId), false);
         }
     }