diff --git a/src/qml/Page/RoomWindow.qml b/src/qml/Page/RoomWindow.qml
index 6711023e9..d932dfaae 100644
--- a/src/qml/Page/RoomWindow.qml
+++ b/src/qml/Page/RoomWindow.qml
@@ -22,4 +22,8 @@ Kirigami.ApplicationWindow {
         currentRoom: window.currentRoom
         disableCancelShortcut: true
     }
+
+    onCurrentRoomChanged: if (!currentRoom) {
+        window.close()
+    }
 }