diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index e5cad51240..1a9df5a9b3 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -132,7 +132,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                     room_id: space.roomId,
                 });
             } else {
-                // TODO: Switch to first room in the RoomList
+                defaultDispatcher.dispatch({
+                    action: "view_home_page",
+                });
             }
         }