diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 9d0b383c0a..cca7d1fd9f 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -98,7 +98,7 @@ module.exports = React.createClass({
         else if (window.localStorage && window.localStorage.getItem("mx_hs_url")) {
             return window.localStorage.getItem("mx_hs_url");
         }
-        else if (this.props.config) {
+        else {
             return this.props.config.default_hs_url
         }
         return "https://matrix.org";
@@ -117,7 +117,7 @@ module.exports = React.createClass({
         else if (window.localStorage && window.localStorage.getItem("mx_is_url")) {
             return window.localStorage.getItem("mx_is_url");
         }
-        else if (this.props.config) {
+        else {
             return this.props.config.default_is_url
         }
         return "https://matrix.org";