diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index b3fc703c..a15447b8 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -210,8 +210,8 @@ export class RoomViewModel extends ViewModel {
                    if (args.length == 1) {
                        let roomName = args[0];
                        try {
-                           await this._options.client.session.joinRoom(roomName);
                            const internalId = await this._options.client.session.joinRoom(roomName);
+                           await this._options.client.session.waitForRoomFromSync(internalId);
                            this.navigation.push("room", internalId);
                        } catch (exc) {
                            if ((exc.statusCode ?? exc.status) === 400) {
diff --git a/src/matrix/Session.js b/src/matrix/Session.js
index ae1dea61..f45cb5b3 100644
--- a/src/matrix/Session.js
+++ b/src/matrix/Session.js
@@ -948,6 +948,23 @@ export class Session {
             return body.room_id;
         });
     }
+
+    waitForRoomFromSync(roomId) {
+        let resolve;
+        const promise = new Promise(r => { resolve = r; })
+        const subscription = {
+            onAdd: (_, value) => {
+                if (value.id === roomId) {
+                    this._session.rooms.unsubscribe(subscription);
+                    resolve();
+                }
+            },
+            onUpdate: () => undefined,
+            onRemove: () => undefined,
+        };
+        this._session.rooms.subscribe(subscription);
+        return promise;
+    }
 }
 
 export function tests() {