diff --git a/app/scripts/const/default-app-settings.js b/app/scripts/const/default-app-settings.js
index f527d663..18aea9fb 100644
--- a/app/scripts/const/default-app-settings.js
+++ b/app/scripts/const/default-app-settings.js
@@ -1,6 +1,6 @@
 const DefaultAppSettings = {
     theme: null, // UI theme
-    autoSwitchTheme: true, // automatically switch between light and dark theme
+    autoSwitchTheme: false, // automatically switch between light and dark theme
     locale: null, // user interface language
     expandGroups: true, // show entries from all subgroups
     listViewWidth: null, // width of the entry list representation
diff --git a/desktop/main.js b/desktop/main.js
index e565433c..929830c3 100644
--- a/desktop/main.js
+++ b/desktop/main.js
@@ -258,8 +258,7 @@ function selectDarkOrLightTheme(theme) {
 
 function createMainWindow() {
     let theme = checkSettingsTheme(appSettings.theme) || getDefaultTheme();
-    const autoSwitchTheme = appSettings.autoSwitchTheme ?? true;
-    if (autoSwitchTheme) {
+    if (appSettings.autoSwitchTheme) {
         theme = selectDarkOrLightTheme(theme);
     }
     const bgColor = themeBgColors[theme] || defaultBgColor;