diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index e1e4b5ea23..ebcf987d4b 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -154,15 +154,14 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
     public setActiveRoomInSpace(space: SpaceKey): void {
         if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return;
-        if (space !== this.activeSpace) this.setActiveSpace(space);
+        if (space !== this.activeSpace) this.setActiveSpace(space, false);
 
         if (space) {
             const roomId = this.getNotificationState(space).getFirstRoomWithNotifications();
             defaultDispatcher.dispatch<ViewRoomPayload>({
                 action: Action.ViewRoom,
                 room_id: roomId,
-                context_switch: true,
-                _trigger: "WebSpaceContextSwitch",
+                _trigger: "WebSpacePanelNotificationBadge",
             });
         } else {
             const lists = RoomListStore.instance.unfilteredLists;
@@ -179,8 +178,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                     defaultDispatcher.dispatch<ViewRoomPayload>({
                         action: Action.ViewRoom,
                         room_id: unreadRoom.roomId,
-                        context_switch: true,
-                        _trigger: "WebSpaceContextSwitch",
+                        _trigger: "WebSpacePanelNotificationBadge",
                     });
                     break;
                 }