diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index a3311ce90d..d67c728bf0 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -101,7 +101,11 @@ export class RoomListStore2 extends AsyncStoreWithClient<ActionPayload> {
     }
 
     // Public for test usage. Do not call this.
-    public async makeReady() {
+    public async makeReady(forcedClient?: MatrixClient) {
+        if (forcedClient) {
+            super.matrixClient = forcedClient;
+        }
+
         // TODO: Remove with https://github.com/vector-im/riot-web/issues/14367
         this.checkEnabled();
         if (!this.enabled) return;
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index 313bd4b77e..e84f943708 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -109,7 +109,7 @@ describe('RoomList', () => {
         client.getRoom = (roomId) => roomMap[roomId];
 
         // Now that everything has been set up, prepare and update the store
-        await RoomListStore.instance.makeReady();
+        await RoomListStore.instance.makeReady(client);
 
         done();
     });