diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 38f597f673..ac328f8387 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -204,7 +204,7 @@ export default React.createClass({
     },
 
     getFallbackHsUrl: function() {
-        if (this.props.serverConfig.isDefault) {
+        if (this.props.serverConfig && this.props.serverConfig.isDefault) {
             return this.props.config.fallback_hs_url;
         } else {
             return null;