diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 8d6a2b7d4fd461694e41a4bf7b7f453e969c1ba2..8e7fe7d82362249774a9de68fa56125005a5eb39 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -429,16 +429,22 @@ public class SettingsActivity extends XmppActivity implements OnSharedPreference
             if (customTheme != null) uiCategory.removePreference(customTheme);
         }
 
-        final boolean customAutomatic = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("custom_theme_automatic", false);
-        if (Build.VERSION.SDK_INT > 30 && theTheme.equals("custom") && !customAutomatic) {
+        if (Build.VERSION.SDK_INT > 30 && theTheme.equals("custom")) {
+            final boolean customAutomatic = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("custom_theme_automatic", false);
             final PreferenceScreen customTheme = (PreferenceScreen) mSettingsFragment.findPreference("custom_theme");
-            final boolean isDark = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("custom_theme_dark", false);
-            if (isDark) {
-                final PreferenceCategory customThemeColors = (PreferenceCategory) mSettingsFragment.findPreference("custom_theme_colors");
-                customTheme.removePreference(customThemeColors);
+            final Preference customThemeIsDark = mSettingsFragment.findPreference("custom_theme_dark");
+
+            if (customAutomatic) {
+                customTheme.removePreference(customThemeIsDark);
             } else {
-                final PreferenceCategory customThemeColorsDark = (PreferenceCategory) mSettingsFragment.findPreference("custom_theme_colors_dark");
-                customTheme.removePreference(customThemeColorsDark);
+                final boolean isDark = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("custom_theme_dark", false);
+                if (isDark) {
+                    final PreferenceCategory customThemeColors = (PreferenceCategory) mSettingsFragment.findPreference("custom_theme_colors");
+                    customTheme.removePreference(customThemeColors);
+                } else {
+                    final PreferenceCategory customThemeColorsDark = (PreferenceCategory) mSettingsFragment.findPreference("custom_theme_colors_dark");
+                    customTheme.removePreference(customThemeColorsDark);
+                }
             }
         }
     }
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index d069cf9c032d23e12588a0adfc3938a8239ba4d5..cc8aa5598bd0dd925bc6d8ea240dd37f821a9a7b 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -204,12 +204,10 @@
                 android:summary="You may sometimes have to force quit the app to get changes applied."/>
             <CheckBoxPreference
                 android:defaultValue="false"
-                android:disableDependentsState="true"
                 android:key="custom_theme_automatic"
                 android:title="Follow System Dark Mode?" />
             <CheckBoxPreference
                 android:defaultValue="false"
-                android:dependency="custom_theme_automatic"
                 android:key="custom_theme_dark"
                 android:title="Custom Theme is Dark?" />