diff --git a/src/qml/Page/RoomList/Page.qml b/src/qml/Page/RoomList/Page.qml
index e06aa6f1c..57c92bedf 100644
--- a/src/qml/Page/RoomList/Page.qml
+++ b/src/qml/Page/RoomList/Page.qml
@@ -26,8 +26,10 @@ Kirigami.Page {
     readonly property int currentWidth: _private.currentWidth + spaceListWidth
     readonly property alias spaceListWidth: spaceDrawer.width
 
+    required property NeoChatConnection connection
+
     readonly property RoomListModel roomListModel: RoomListModel {
-        connection: Controller.activeConnection
+        connection: root.connection
     }
 
     readonly property bool collapsed: Config.collapsed
diff --git a/src/qml/main.qml b/src/qml/main.qml
index 6ad9aeda7..a32e12180 100644
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -240,7 +240,7 @@ Kirigami.ApplicationWindow {
                 pageStack.replace("qrc:/WelcomePage.qml", {});
             } else if (!roomListLoaded) {
                 pageStack.replace(roomListComponent, {
-                    activeConnection: Controller.activeConnection
+                    connection: Controller.activeConnection
                 });
                 roomListLoaded = true;
                 roomListPage = pageStack.currentItem