diff --git a/src/controllers/pages/MatrixChat.js b/src/controllers/pages/MatrixChat.js
index 622e546b..09c01374 100644
--- a/src/controllers/pages/MatrixChat.js
+++ b/src/controllers/pages/MatrixChat.js
@@ -280,10 +280,10 @@ module.exports = {
             if (roomString[0] == '#') {
                 var self = this;
                 MatrixClientPeg.get().getRoomIdForAlias(roomString).done(function(result) {
-                    self.setState({ready: true});
+                    if (self.sdkReady) self.setState({ready: true});
                     defer.resolve(result.room_id);
                 }, function() {
-                    self.setState({ready: true});
+                    if (self.sdkReady) self.setState({ready: true});
                     defer.resolve(null);
                 });
                 this.setState({ready: false});