diff --git a/src/controllers/pages/MatrixChat.js b/src/controllers/pages/MatrixChat.js
index fd23607b87..e54f800e63 100644
--- a/src/controllers/pages/MatrixChat.js
+++ b/src/controllers/pages/MatrixChat.js
@@ -297,7 +297,8 @@ module.exports = {
         var Notifier = sdk.getComponent('organisms.Notifier');
         var cli = MatrixClientPeg.get();
         var self = this;
-        cli.on('syncComplete', function() {
+        cli.on('sync', function(state) {
+            if (self.sdkReady || state !== "PREPARED") { return; }
             self.sdkReady = true;
 
             if (self.starting_room_alias) {