diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
index 47497bd0b1..6a72a5811a 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
@@ -47,7 +47,7 @@ import timber.log.Timber
 class DetailsMiddleware {
     private val eraseWalletMiddleware = EraseWalletMiddleware()
     private val manageSecurityMiddleware = ManageSecurityMiddleware()
-    private val managePrivacyMiddleware = ManagePrivacyMiddleware()
+    private val appSettingsMiddleware = AppSettingsMiddleware()
     private val accessCodeRecoveryMiddleware = AccessCodeRecoveryMiddleware()
     val detailsMiddleware: Middleware<AppState> = { _, stateProvider ->
         { next ->
@@ -67,7 +67,7 @@ class DetailsMiddleware {
         when (action) {
             is DetailsAction.ResetToFactory -> eraseWalletMiddleware.handle(action)
             is DetailsAction.ManageSecurity -> manageSecurityMiddleware.handle(action, state)
-            is DetailsAction.AppSettings -> managePrivacyMiddleware.handle(state, action)
+            is DetailsAction.AppSettings -> appSettingsMiddleware.handle(state, action)
             is DetailsAction.ReCreateTwinsWallet -> {
                 store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet))
                 store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingTwins))
@@ -207,7 +207,7 @@ class DetailsMiddleware {
         }
     }
 
-    class ManagePrivacyMiddleware {
+    class AppSettingsMiddleware {
         fun handle(state: DetailsState, action: DetailsAction.AppSettings) {
             when (action) {
                 is DetailsAction.AppSettings.SwitchPrivacySetting -> {
@@ -261,6 +261,8 @@ class DetailsMiddleware {
 
             scope.launch {
                 repository.changeAppThemeMode(appThemeMode)
+
+                store.dispatchWithMain(GlobalAction.ChangeAppThemeMode(appThemeMode))
             }
         }
 
diff --git a/domain/app-theme/models/src/main/kotlin/com/tangem/domain/apptheme/model/AppThemeMode.kt b/domain/app-theme/models/src/main/kotlin/com/tangem/domain/apptheme/model/AppThemeMode.kt
index db744ebb4c..dd24287e13 100644
--- a/domain/app-theme/models/src/main/kotlin/com/tangem/domain/apptheme/model/AppThemeMode.kt
+++ b/domain/app-theme/models/src/main/kotlin/com/tangem/domain/apptheme/model/AppThemeMode.kt
@@ -25,7 +25,7 @@ enum class AppThemeMode {
         /**
          * The default [AppThemeMode].
          */
-        val DEFAULT: AppThemeMode = FORCE_LIGHT
+        val DEFAULT: AppThemeMode = FOLLOW_SYSTEM
 
         /**
          * List of available [AppThemeMode]s.