diff --git a/ts/background.ts b/ts/background.ts
index 08c589e23..14fe114ee 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -689,9 +689,6 @@ export async function startApp(): Promise<void> {
         window.storage.remove('remoteBuildExpiration');
       }
 
-      const themeSetting = window.Events.getThemeSetting();
-      const newThemeSetting = mapOldThemeToNew(themeSetting);
-
       if (window.isBeforeVersion(lastVersion, 'v1.29.2-beta.1')) {
         // Stickers flags
         await Promise.all([
@@ -708,14 +705,14 @@ export async function startApp(): Promise<void> {
         );
       }
 
-      if (
-        window.isBeforeVersion(lastVersion, 'v1.25.0') &&
-        window.platform === 'darwin' &&
-        newThemeSetting === window.systemTheme
-      ) {
-        window.Events.setThemeSetting('system');
-      } else {
-        window.Events.setThemeSetting(newThemeSetting);
+      const themeSetting = window.Events.getThemeSetting();
+      const newThemeSetting = mapOldThemeToNew(themeSetting);
+      if (window.isBeforeVersion(lastVersion, 'v1.25.0')) {
+        if (newThemeSetting === window.systemTheme) {
+          window.Events.setThemeSetting('system');
+        } else {
+          window.Events.setThemeSetting(newThemeSetting);
+        }
       }
 
       if (