diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5dfcd038ec..c62b39cda0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -363,7 +363,7 @@
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Mirror local video feed": "Mirror local video feed",
     "Enable Community Filter Panel": "Enable Community Filter Panel",
-    "Match system theme": "Match system theme",
+    "Match system dark mode setting": "Match system dark mode setting",
     "Allow Peer-to-Peer for 1:1 calls": "Allow Peer-to-Peer for 1:1 calls",
     "Send analytics data": "Send analytics data",
     "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 8a3bc3ecbc..59e60353b8 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -278,7 +278,7 @@ export const SETTINGS = {
     "use_system_theme": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: true,
-        displayName: _td("Match system theme"),
+        displayName: _td("Match system dark mode setting"),
     },
     "webRtcAllowPeerToPeer": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
diff --git a/src/theme.js b/src/theme.js
index 43bc813d34..fa7e3f783b 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -84,7 +84,7 @@ export class ThemeWatcher {
     }
 
     isSystemThemeSupported() {
-        return this._preferDark || this._preferLight;
+        return this._preferDark.matches || this._preferLight.matches;
     }
 }