diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index bae1f0849a..fbb585924e 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -738,13 +738,11 @@ module.exports = React.createClass({
         if (teamToken) {
             this._teamToken = teamToken;
             dis.dispatch({action: 'view_home_page'});
-            return;
         } else if (this._is_registered) {
             dis.dispatch({action: 'view_user_settings'});
-            return;
+        } else {
+            dis.dispatch({action: 'view_room_directory'});
         }
-
-        dis.dispatch({action: 'view_room_directory'});
     },
 
     /**