diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index a3b685abd..0df5c3e85 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -150,7 +150,7 @@ public final class Constants {
             public static final String AUTO = "auto";
             public static final String LIGHT = "light";
             public static final String DARK = "dark";
-            public static final String DEFAULT = Constants.Pref.Theme.LIGHT;
+            public static final String DEFAULT = Constants.Pref.Theme.AUTO;
         }
 
         public static final class ProxyType {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
index 1f5451f97..d81a56e26 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
@@ -34,6 +34,7 @@ import androidx.annotation.Nullable;
 import com.google.auto.value.AutoValue;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Constants.Pref;
+import org.sufficientlysecure.keychain.Constants.Pref.Theme;
 import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress;
 import timber.log.Timber;
 
@@ -229,7 +230,7 @@ public class Preferences {
     }
 
     public String getTheme() {
-        return mSharedPreferences.getString(Pref.THEME, Pref.Theme.LIGHT);
+        return mSharedPreferences.getString(Pref.THEME, Theme.DEFAULT);
     }
 
     public void setTheme(String value) {