diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
index d253021143..95cb45d641 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
@@ -66,21 +66,24 @@ private fun commonSecurityAndPrivacyStates(isSpace: Boolean): Sequence<SecurityA
         savedSettings = aSecurityAndPrivacySettings(
             roomAccess = SecurityAndPrivacyRoomAccess.SpaceMember(persistentListOf())
         ),
+        spaceSelectionMode = SpaceSelectionMode.Multiple,
         isSpace = isSpace,
         isKnockEnabled = false,
     ),
     aSecurityAndPrivacyState(
-        editedSettings = aSecurityAndPrivacySettings(
+        spaceSelectionMode = SpaceSelectionMode.Multiple,
+        savedSettings = aSecurityAndPrivacySettings(
             roomAccess = SecurityAndPrivacyRoomAccess.AskToJoinWithSpaceMember(persistentListOf()),
         ),
         isSpace = isSpace,
     ),
     aSecurityAndPrivacyState(
+        spaceSelectionMode = SpaceSelectionMode.Multiple,
         savedSettings = aSecurityAndPrivacySettings(
             roomAccess = SecurityAndPrivacyRoomAccess.AskToJoinWithSpaceMember(persistentListOf())
         ),
         isSpace = isSpace,
-        isKnockEnabled = false,
+        isKnockEnabled = true,
     ),
     aSecurityAndPrivacyState(
         editedSettings = aSecurityAndPrivacySettings(