diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index a74652a39d..b94e772b02 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -87,10 +87,10 @@ class RoomViewStore extends Store {
         if (payload.room_id) {
             this._setState({
                 roomId: payload.room_id,
+                roomLoading: false,
+                roomLoadError: null,
             });
-        }
-
-        if (payload.room_alias && !payload.room_id) {
+        } else if (payload.room_alias) {
             this._setState({
                 roomId: null,
                 roomAlias: payload.room_alias,
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index 7100dced19..2f545ffd74 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -45,12 +45,15 @@ describe('RoomViewStore', function() {
             done();
         };
 
-        dispatch({ action: 'view_room', room_alias: '#somealias2:aser.ver' });
+        RoomViewStore.addListener(() => {
+            // Wait until the room alias has resolved and the room ID is
+            if (!RoomViewStore.isRoomLoading()) {
+                expect(RoomViewStore.getRoomId()).toBe("!randomcharacters:aser.ver");
+                dispatch({ action: 'join_room' });
+                expect(RoomViewStore.isJoining()).toBe(true);
+            }
+        });
 
-        // Wait for the next event loop to allow for room alias resolution
-        setTimeout(() => {
-            dispatch({ action: 'join_room' });
-            expect(RoomViewStore.isJoining()).toBe(true);
-        }, 0);
+        dispatch({ action: 'view_room', room_alias: '#somealias2:aser.ver' });
     });
 });