diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index cdd4625dbf..de916ad7aa 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -674,7 +674,6 @@ export default createReactClass({
                     this.state.view !== VIEWS.E2E_SETUP
                 ) {
                     this._onLoggedIn();
-                    ThemeController.isLogin = false;
                 }
                 break;
             case 'on_client_not_viable':
@@ -1176,6 +1175,7 @@ export default createReactClass({
      * Called when a new logged in session has started
      */
     _onLoggedIn: async function() {
+        ThemeController.isLogin = false;
         this.setStateForNewView({ view: VIEWS.LOGGED_IN });
         if (MatrixClientPeg.currentUserIsJustRegistered()) {
             MatrixClientPeg.setJustRegisteredUserId(null);