diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index fb553535aa..63c4e9e0dc 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -196,7 +196,7 @@ export default React.createClass({
             case PageTypes.HomePage:
                 page_element = <HomePage
                     collapsedRhs={this.props.collapse_rhs}
-                    config={this.props.config}
+                    teamToken={window.localStorage.getItem("mx_team_token")}
                 />
                 if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>
                 break;
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index f3fc5bf260..3cc34ba69c 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -694,7 +694,7 @@ module.exports = React.createClass({
                         )[0].roomId;
                         self.setState({ready: true, currentRoomId: firstRoom, page_type: PageTypes.RoomView});
                     } else {
-                        if (self.props.config.home_page) {
+                        if (window.localStorage.getItem('mx_team_token')) {
                             self.setState({ready: true, page_type: PageTypes.HomePage});
                         }
                         else {