1 files changed, 5 insertions, 2 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java
index b7e4934f5..afe814fcb 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java
@@ -59,12 +59,15 @@ public abstract class ThemeSwitcher {
         if (theme == UserPreferences.ThemePreference.SYSTEM) {
             int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
             if (nightMode == Configuration.UI_MODE_NIGHT_YES) {
-                return UserPreferences.ThemePreference.DARK;
+                theme = UserPreferences.ThemePreference.DARK;
             } else {
-                return UserPreferences.ThemePreference.LIGHT;
+                theme = UserPreferences.ThemePreference.LIGHT;
 
             }
         }
+        if (theme == UserPreferences.ThemePreference.DARK && UserPreferences.getIsBlackTheme()) {
+            theme = UserPreferences.ThemePreference.BLACK;
+        }
         return theme;
     }
 }