diff --git a/src/qml/RoomListPage.qml b/src/qml/RoomListPage.qml
index abd18d82d..366728b72 100644
--- a/src/qml/RoomListPage.qml
+++ b/src/qml/RoomListPage.qml
@@ -220,7 +220,7 @@ Kirigami.Page {
                     id: layoutTimer
                     interval: 100
                     onTriggered: if (spaceDrawer.showDirectChats || spaceDrawer.selectedSpaceId.length < 1) {
-                        RoomManager.enterRoom(listView.itemAtIndex(0).currentRoom)
+                        RoomManager.resolveResource(listView.itemAtIndex(0).currentRoom.id)
                     }
                 }
 
diff --git a/src/qml/SpaceDrawer.qml b/src/qml/SpaceDrawer.qml
index 97688d157..93c494450 100644
--- a/src/qml/SpaceDrawer.qml
+++ b/src/qml/SpaceDrawer.qml
@@ -173,7 +173,7 @@ QQC2.Control {
                             onSelected: {
                                 root.showDirectChats = false
                                 if (!SpaceHierarchyCache.isSpaceChild(roomId, RoomManager.currentRoom.id) || root.selectedSpaceId == roomId) {
-                                    RoomManager.enterSpaceHome(currentRoom)
+                                    RoomManager.resolveResource(currentRoom.id)
                                 }
                                 root.selectedSpaceId = roomId
                             }