diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index a49414cf032..eedf2b767be 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -768,11 +768,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
     private switchSpaceIfNeeded = throttle(() => {
         const roomId = RoomViewStore.getRoomId();
-        if (this.isRoomInSpace(this.activeSpace, roomId)) return;
-
-        if (this.matrixClient.getRoom(roomId)?.isSpaceRoom()) {
-            this.goToFirstSpace(true);
-        } else {
+        if (!this.isRoomInSpace(this.activeSpace, roomId) && !this.matrixClient.getRoom(roomId)?.isSpaceRoom()) {
             this.switchToRelatedSpace(roomId);
         }
     }, 100, { leading: true, trailing: true });
@@ -1069,9 +1065,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
         switch (payload.action) {
             case "view_room": {
-                // Don't auto-switch rooms when reacting to a context-switch
+                // Don't auto-switch rooms when reacting to a context-switch or for new rooms being created
                 // as this is not helpful and can create loops of rooms/space switching
-                if (payload.context_switch) break;
+                if (payload.context_switch || payload.justCreatedOpts) break;
                 let roomId = payload.room_id;
 
                 if (payload.room_alias && !roomId) {
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
index d09624dc62e..b61b0095c77 100644
--- a/src/utils/membership.ts
+++ b/src/utils/membership.ts
@@ -26,6 +26,9 @@ import ErrorDialog from "../components/views/dialogs/ErrorDialog";
 import dis from "../dispatcher/dispatcher";
 import RoomViewStore from "../stores/RoomViewStore";
 import Spinner from "../components/views/elements/Spinner";
+import { isMetaSpace } from "../stores/spaces";
+import SpaceStore from "../stores/spaces/SpaceStore";
+import { Action } from "../dispatcher/actions";
 
 /**
  * Approximation of a membership status for a given room.
@@ -179,7 +182,16 @@ export async function leaveRoomBehaviour(roomId: string, retry = true, spinner =
         return;
     }
 
-    if (RoomViewStore.getRoomId() === roomId) {
+    if (SpaceStore.spacesEnabled &&
+        !isMetaSpace(SpaceStore.instance.activeSpace) &&
+        SpaceStore.instance.activeSpace !== roomId &&
+        RoomViewStore.getRoomId() === roomId
+    ) {
+        dis.dispatch({
+            action: Action.ViewRoom,
+            room_id: SpaceStore.instance.activeSpace,
+        });
+    } else {
         dis.dispatch({ action: 'view_home_page' });
     }
 }