diff --git a/screenshots/com.nextcloud.client.SettingsActivityIT_open.png b/screenshots/com.nextcloud.client.SettingsActivityIT_open.png
index 1ecb2aeba7f1..9b497c4550bb 100644
Binary files a/screenshots/com.nextcloud.client.SettingsActivityIT_open.png and b/screenshots/com.nextcloud.client.SettingsActivityIT_open.png differ
diff --git a/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
index a231116b182a..6b0644ab54fe 100644
--- a/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
+++ b/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
@@ -414,10 +414,10 @@ public void setDarkThemeMode(DarkMode mode) {
     @Override
     public DarkMode getDarkThemeMode() {
         try {
-            return DarkMode.valueOf(preferences.getString(PREF__DARK_THEME, DarkMode.LIGHT.name()));
+            return DarkMode.valueOf(preferences.getString(PREF__DARK_THEME, DarkMode.SYSTEM.name()));
         } catch (ClassCastException e) {
-            preferences.edit().putString(PREF__DARK_THEME, DarkMode.LIGHT.name()).apply();
-            return DarkMode.DARK;
+            preferences.edit().putString(PREF__DARK_THEME, DarkMode.SYSTEM.name()).apply();
+            return DarkMode.SYSTEM;
         }
     }
 
diff --git a/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
index edc791d057e6..da124f4c4c3a 100644
--- a/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
@@ -711,8 +711,8 @@ private void setupGeneralCategory(int accentColor) {
         themePref.setEntryValues(themeValues.toArray(new String[0]));
 
         if (TextUtils.isEmpty(themePref.getEntry())) {
-            themePref.setValue(DarkMode.LIGHT.name());
-            themePref.setSummary(TextUtils.isEmpty(themePref.getEntry()) ? DarkMode.LIGHT.name() : themePref.getEntry());
+            themePref.setValue(DarkMode.SYSTEM.name());
+            themePref.setSummary(TextUtils.isEmpty(themePref.getEntry()) ? DarkMode.SYSTEM.name() : themePref.getEntry());
         }
 
         themePref.setOnPreferenceChangeListener((preference, newValue) -> {