diff --git a/src/settings/handlers/AccountSettingsHandler.js b/src/settings/handlers/AccountSettingsHandler.js
index fe0ad2a500..e50358a728 100644
--- a/src/settings/handlers/AccountSettingsHandler.js
+++ b/src/settings/handlers/AccountSettingsHandler.js
@@ -26,6 +26,9 @@ export default class AccountSettingHandler extends SettingsHandler {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
             const content = this._getSettings("org.matrix.preview_urls");
+
+            // Check to make sure that we actually got a boolean
+            if (typeof(content['disable']) !== "boolean") return null;
             return !content['disable'];
         }
 
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index 503d5de6c4..e946581807 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -25,6 +25,9 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
             const content = this._getSettings(roomId, "org.matrix.room.preview_urls");
+
+            // Check to make sure that we actually got a boolean
+            if (typeof(content['disable']) !== "boolean") return null;
             return !content['disable'];
         }
 
diff --git a/src/settings/handlers/RoomSettingsHandler.js b/src/settings/handlers/RoomSettingsHandler.js
index 3aee0dd6eb..cb3e836c7f 100644
--- a/src/settings/handlers/RoomSettingsHandler.js
+++ b/src/settings/handlers/RoomSettingsHandler.js
@@ -25,6 +25,9 @@ export default class RoomSettingsHandler extends SettingsHandler {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
             const content = this._getSettings(roomId, "org.matrix.room.preview_urls");
+
+            // Check to make sure that we actually got a boolean
+            if (typeof(content['disable']) !== "boolean") return null;
             return !content['disable'];
         }