diff --git a/src/settings/handlers/AccountSettingsHandler.js b/src/settings/handlers/AccountSettingsHandler.js
index 71cef52c4e..979966ac79 100644
--- a/src/settings/handlers/AccountSettingsHandler.js
+++ b/src/settings/handlers/AccountSettingsHandler.js
@@ -73,6 +73,10 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             return !content['disable'];
         }
 
+        if (settingName === "notificationsEnabled") {
+            return this._getSettings("m.notification.sound");
+        }
+
         // Special case for breadcrumbs
         if (settingName === "breadcrumb_rooms") {
             const content = this._getSettings(BREADCRUMBS_EVENT_TYPE) || {};
diff --git a/src/settings/handlers/RoomSettingsHandler.js b/src/settings/handlers/RoomSettingsHandler.js
index 79626e2186..e929e81c88 100644
--- a/src/settings/handlers/RoomSettingsHandler.js
+++ b/src/settings/handlers/RoomSettingsHandler.js
@@ -67,6 +67,10 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
             if (typeof(content['disable']) !== "boolean") return null;
             return !content['disable'];
         }
+        
+        if (settingName === "notificationsEnabled") {
+            return this._getSettings(roomId, "m.notification.sound");
+        }
 
         const settings = this._getSettings(roomId) || {};
         return settings[settingName];