diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
index fa51008113..e1766f3220 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
@@ -75,12 +75,11 @@ class SecurityAndPrivacyPresenter(
 
         val savedSettings by remember {
             derivedStateOf {
-                val historyVisibility = roomInfo.historyVisibility.map()
                 SecurityAndPrivacySettings(
                     roomAccess = roomInfo.joinRule.map(),
                     isEncrypted = roomInfo.isEncrypted == true,
                     isVisibleInRoomDirectory = savedIsVisibleInRoomDirectory.value,
-                    historyVisibility = historyVisibility,
+                    historyVisibility = roomInfo.historyVisibility.map(),
                     address = roomInfo.firstDisplayableAlias(homeserverName)?.value,
                 )
             }