diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 48e7f40dca..2337d62fd8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -700,7 +700,8 @@ module.exports = React.createClass({
         // Show screens (like 'register') that need to be shown without onLoggedIn
         // being called. 'register' needs to be routed here when the email confirmation
         // link is clicked on.
-        if (['register'].indexOf(this.state.screenAfterLogin.screen) !== -1) {
+        if (this.state.screenAfterLogin &&
+            ['register'].indexOf(this.state.screenAfterLogin.screen) !== -1) {
             this._showScreenAfterLogin();
         }
     },