diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 4198980a17..38f597f673 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -203,9 +203,12 @@ export default React.createClass({
         };
     },
 
-    // TODO: TravisR - Remove this or put it somewhere else
     getFallbackHsUrl: function() {
-        return this.props.config.fallback_hs_url;
+        if (this.props.serverConfig.isDefault) {
+            return this.props.config.fallback_hs_url;
+        } else {
+            return null;
+        }
     },
 
     getServerProperties() {
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 318c706136..0850039344 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -26,6 +26,8 @@ export class ValidatedServerConfig {
 
     isUrl: string;
     identityEnabled: boolean;
+
+    isDefault: boolean;
 }
 
 export default class AutoDiscoveryUtils {
@@ -99,6 +101,7 @@ export default class AutoDiscoveryUtils {
             hsNameIsDifferent: url.hostname !== preferredHomeserverName,
             isUrl: preferredIdentityUrl,
             identityEnabled: !SdkConfig.get()['disable_identity_server'],
+            isDefault: false,
         });
     }
 }