diff --git a/src/components/views/elements/SettingsCheckbox.js b/src/components/views/elements/SettingsCheckbox.js
index a195bae691..d9b293b086 100644
--- a/src/components/views/elements/SettingsCheckbox.js
+++ b/src/components/views/elements/SettingsCheckbox.js
@@ -64,7 +64,7 @@ module.exports = React.createClass({
                        value={this.props.value}
                        checked={val === this.props.value}
                        onChange={this.onChange}
-                       />
+                />
             );
         }
 
diff --git a/src/settings/ConfigSettingsHandler.js b/src/settings/ConfigSettingsHandler.js
index 5cd6d22411..b9f392f048 100644
--- a/src/settings/ConfigSettingsHandler.js
+++ b/src/settings/ConfigSettingsHandler.js
@@ -24,7 +24,8 @@ import SdkConfig from "../SdkConfig";
  */
 export default class ConfigSettingsHandler extends SettingsHandler {
     getValue(settingName, roomId) {
-        const settingsConfig = SdkConfig.get()["settingDefaults"];
+        const config = SdkConfig.get() || {};
+        const settingsConfig = config["settingDefaults"];
         if (!settingsConfig || !settingsConfig[settingName]) return null;
         return settingsConfig[settingName];
     }