diff --git a/src/controllers/pages/MatrixChat.js b/src/controllers/pages/MatrixChat.js
index d43fd1e4c8..c3fe559075 100644
--- a/src/controllers/pages/MatrixChat.js
+++ b/src/controllers/pages/MatrixChat.js
@@ -195,9 +195,11 @@ module.exports = {
                     firstRoom = RoomListSorter.mostRecentActivityFirst(
                         cli.getRooms()
                     )[0].roomId;
+                    self.setState({ready: true, currentRoom: firstRoom});
+                    self.notifyNewScreen('room/'+firstRoom);
+                } else {
+                    self.setState({ready: true});
                 }
-                self.setState({ready: true, currentRoom: firstRoom});
-                self.notifyNewScreen('room/'+firstRoom);
             } else {
                 self.setState({ready: true});
             }