diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index e6c0e77d10..0b1663ee11 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -681,6 +681,9 @@ module.exports = React.createClass({
             homeserverUrl: MatrixClientPeg.get().getHomeserverUrl(),
             onFinished: (submitted, credentials) => {
                 if (!submitted) {
+                    dis.dispatch({
+                        action: 'cancel_after_sync_prepared',
+                    });
                     return;
                 }
                 this.onRegistered(credentials);
diff --git a/src/stores/LifecycleStore.js b/src/stores/LifecycleStore.js
index d38138b3ef..d954ef16b6 100644
--- a/src/stores/LifecycleStore.js
+++ b/src/stores/LifecycleStore.js
@@ -45,6 +45,11 @@ class LifecycleStore extends Store {
                     deferred_action: payload.deferred_action,
                 });
                 break;
+            case 'cancel_after_sync_prepared':
+                this._setState({
+                    deferred_action: null,
+                });
+                break;
             case 'sync_state':
                 if (payload.state !== 'PREPARED') {
                     break;