diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index bf4258d990..e0f8ab96b3 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -100,6 +100,10 @@ module.exports = React.createClass({
                 console.log("Not registering as guest; email invite.");
                 this._autoRegisterAsGuest = false;
             }
+            else if (this.props.startingQueryParams.client_secret && this.props.startingQueryParams.sid) {
+                console.log("Not registering as guest; registration.");
+                this._autoRegisterAsGuest = false;
+            }
             else {
                 this._autoRegisterAsGuest = true;
             }