diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index aaa38c9292..37b17f03b4 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -91,8 +91,12 @@ object ThemeUtils {
     }
 
     fun invalidateNightMode(context: Context) {
-        mThemeInitialized = false;
-        setApplicationTheme(context.applicationContext, getApplicationLightTheme(context), getApplicationDarkTheme(context))
+        val lightTheme = getApplicationLightTheme(context)
+        val darkTheme = getApplicationDarkTheme(context)
+        if (lightTheme != darkTheme && darkThemePossible(context)) {
+            mThemeInitialized = false;
+            setApplicationTheme(context.applicationContext, getApplicationLightTheme(context), getApplicationDarkTheme(context))
+        }
     }
 
     // init the theme