diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
index 636230ec71..d2bf16fdc4 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@@ -14,15 +14,12 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -35,7 +32,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
@@ -133,7 +129,10 @@ fun ConfigureRoomView(
             )
             if (state.config.roomVisibility is RoomVisibilityState.Public) {
                 RoomAccessOptions(
-                    selected = state.config.roomVisibility.roomAccess,
+                    selected = when (state.config.roomVisibility.roomAccess) {
+                        RoomAccess.Anyone -> RoomAccessItem.Anyone
+                        RoomAccess.Knocking -> RoomAccessItem.AskToJoin
+                    },
                     onOptionClick = {
                         focusManager.clearFocus()
                         state.eventSink(ConfigureRoomEvents.RoomAccessChanged(it))
@@ -290,7 +289,7 @@ private fun RoomVisibilityOptions(
 
 @Composable
 private fun RoomAccessOptions(
-    selected: RoomAccess,
+    selected: RoomAccessItem,
     onOptionClick: (RoomAccessItem) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -302,10 +301,7 @@ private fun RoomAccessOptions(
         RoomAccessItem.entries.forEach { item ->
             RoomAccessOption(
                 roomAccessItem = item,
-                isSelected = when (item) {
-                    RoomAccessItem.Anyone -> selected == RoomAccess.Anyone
-                    RoomAccessItem.AskToJoin -> selected == RoomAccess.Knocking
-                },
+                isSelected = item == selected,
                 onOptionClick = onOptionClick,
             )
         }
@@ -317,7 +313,7 @@ private fun RoomAddress(
     address: RoomAddress,
     onAddressChange: (String) -> Unit,
     modifier: Modifier = Modifier,
-){
+) {
     Column(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -331,7 +327,7 @@ private fun RoomAddress(
 
         TextField(
             modifier = Modifier.fillMaxWidth(),
-            value = when(address) {
+            value = when (address) {
                 is RoomAddress.AutoFilled -> address.address
                 is RoomAddress.Edited -> address.address
             },
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccess.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccess.kt
index 3a86280f11..aeaf63b2c5 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccess.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccess.kt
@@ -8,5 +8,5 @@
 package io.element.android.features.createroom.impl.configureroom
 
 enum class RoomAccess {
-    Anyone, Knocking, Invite
+    Anyone, Knocking
 }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt
index 6c21935196..c8791e1138 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt
@@ -21,6 +21,6 @@ enum class RoomAccessItem(
     AskToJoin(
         title = CommonStrings.screen_create_room_access_section_knocking_option_title,
         description = CommonStrings.screen_create_room_access_section_knocking_option_description,
-    )
+    ),
 }
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityState.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityState.kt
index 0a50a98a3f..ad61fadb3a 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityState.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityState.kt
@@ -8,14 +8,10 @@
 package io.element.android.features.createroom.impl.configureroom
 
 sealed interface RoomVisibilityState {
-    val roomAccess: RoomAccess
-
-    data object Private : RoomVisibilityState {
-        override val roomAccess: RoomAccess = RoomAccess.Invite
-    }
+    data object Private : RoomVisibilityState
 
     data class Public(
         val roomAddress: RoomAddress,
-        override val roomAccess: RoomAccess
+        val roomAccess: RoomAccess
     ) : RoomVisibilityState
 }