diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 05b0c1f6dbf7f4c2ff6dab223cc278991a3c17c0..de24c026fc47b379a896191edb20be6a73d3c3f8 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -582,6 +582,7 @@ public class SettingsActivity extends XmppActivity implements OnSharedPreference
         } else if (name.equals(AUTOMATIC_MESSAGE_DELETION)) {
             xmppConnectionService.expireOldMessages(true);
         } else if ( name.equals(THEME) ||
+                    name.equals("custom_theme_automatic") ||
                     name.equals("custom_theme_primary") ||
                     name.equals("custom_theme_primary_dark") ||
                     name.equals("custom_theme_accent") ||
diff --git a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
index e844f07ba59744249bc08e0a04cf058660d4fe6b..2f6fd2e1dcb2887dfb6f7dcaf41aa84bc27c5be7 100644
--- a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
@@ -137,7 +137,9 @@ public class ThemeHelper {
 
 	private static boolean isDark(final SharedPreferences sharedPreferences, final Resources resources) {
 		final String setting = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme));
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && "automatic".equals(setting)) {
+		if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && "automatic".equals(setting)) ||
+			("custom".equals(setting) && sharedPreferences.getBoolean("custom_theme_automatic", false))
+		) {
 			return (resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
 		} else {
 			if ("custom".equals(setting)) return sharedPreferences.getBoolean("custom_theme_dark", false);
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 260cca0b19931ea19161fe530fde121716f4dd3b..7d5c526c6af8cf95407acb6726e86ffd2615fb7e 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -209,6 +209,12 @@
 
                 <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?" />
                 <com.rarepebble.colorpicker.ColorPreference