diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 063276c309..db5b7d034b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1573,7 +1573,7 @@ export default React.createClass({
                 params: params,
             });
         } else if (screen === 'soft_logout') {
-            if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId()) {
+            if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
                 // Logged in - visit a room
                 this._viewLastRoom();
             } else {