diff --git a/src/qml/Page/RoomList/SpaceDrawer.qml b/src/qml/Page/RoomList/SpaceDrawer.qml
index a21681e3b..aa701ca37 100644
--- a/src/qml/Page/RoomList/SpaceDrawer.qml
+++ b/src/qml/Page/RoomList/SpaceDrawer.qml
@@ -72,7 +72,12 @@ QQC2.Control {
                                 connection: Controller.activeConnection
                             }
                         }
-                        onCountChanged: root.enabled = count > 0
+                        onCountChanged: {
+                            root.enabled = count > 0
+                            if (!Controller.activeConnection.room(root.selectedSpaceId)) {
+                                root.selectedSpaceId = ""
+                            }
+                        }
                         Component.onCompleted: root.enabled = count > 0
 
                         delegate: AvatarTabButton {