diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 72680a3eac..3265249105 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -464,6 +464,10 @@ module.exports = React.createClass({
                 this.notifyNewScreen('directory');
                 break;
             case 'view_home_page':
+                if (!this._teamToken) {
+                    dis.dispatch({action: 'view_room_directory'});
+                    return;
+                }
                 this._setPage(PageTypes.HomePage);
                 this.notifyNewScreen('home');
                 break;