diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index d3e0f6ee2d..d58b017f4d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -791,6 +791,9 @@ module.exports = React.createClass({
                     if (submitted) {
                         this.props.onRegistered(credentials);
                     } else {
+                        dis.dispatch({
+                            action: 'cancel_after_sync_prepared',
+                        });
                         dis.dispatch({
                             action: 'cancel_join',
                         });