From 43bef7f1df6ac3e5aee86b1f4ddddfcbf70f9272 Mon Sep 17 00:00:00 2001
From: Timur Gilfanov <timurgilfanov@gmail.com>
Date: Sun, 5 Apr 2026 12:34:07 +0400
Subject: [PATCH] Add isBlackThemeAllowed as a key to theme remember block

---
 .../android/libraries/designsystem/theme/ElementThemeApp.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt
index c0700620bc..0c2fdff0ab 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt
@@ -64,7 +64,7 @@ fun ElementThemeApp(
     val isBlackThemeAllowed by remember {
         featureFlagService.isFeatureEnabledFlow(FeatureFlags.AllowBlackTheme)
     }.collectAsState(initial = false)
-    val theme by remember {
+    val theme by remember(isBlackThemeAllowed) {
         appPreferencesStore.getThemeFlow().mapToTheme(allowBlackTheme = isBlackThemeAllowed)
     }.collectAsState(initial = Theme.System)
     LaunchedEffect(theme) {