diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 83b446597c..d06c2c2226 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -778,6 +778,7 @@ module.exports = React.createClass({
                 onFinished: (submitted, credentials) => {
                     if (!submitted) {
                         mxIdPromise.reject();
+                        return;
                     }
                     this.props.onRegistered(credentials);
                     mxIdPromise.resolve();