diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 4d52fa00f2..9de291249f 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -139,7 +139,7 @@ module.exports = {
 
     getSyncedSetting: function(type, defaultValue = null) {
         const settings = this.getSyncedSettings();
-        return settings.hasOwnProperty(type) ? settings[type] : null;
+        return settings.hasOwnProperty(type) ? settings[type] : defaultValue;
     },
 
     setSyncedSetting: function(type, value) {
@@ -156,7 +156,7 @@ module.exports = {
 
     getLocalSetting: function(type, defaultValue = null) {
         const settings = this.getLocalSettings();
-        return settings.hasOwnProperty(type) ? settings[type] : null;
+        return settings.hasOwnProperty(type) ? settings[type] : defaultValue;
     },
 
     setLocalSetting: function(type, value) {