diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
index ec3e31f1e0..13a4952308 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
@@ -27,6 +27,7 @@ import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.createroom.CreateRoomParameters
+import io.element.android.libraries.matrix.api.createroom.JoinRuleOverride
 import io.element.android.libraries.matrix.api.createroom.RoomPreset
 import io.element.android.libraries.matrix.api.createroom.RoomVisibility
 import io.element.android.libraries.matrix.ui.media.AvatarAction
@@ -38,6 +39,7 @@ import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import java.util.Optional
 import javax.inject.Inject
 
 class ConfigureRoomPresenter @Inject constructor(
@@ -138,6 +140,7 @@ class ConfigureRoomPresenter @Inject constructor(
                 isEncrypted = config.roomVisibility is RoomVisibilityState.Private,
                 isDirect = false,
                 visibility = if (config.roomVisibility is RoomVisibilityState.Public) RoomVisibility.PUBLIC else RoomVisibility.PRIVATE,
+                joinRuleOverride = if (config.roomVisibility is RoomVisibilityState.Public) config.roomVisibility.roomAccess.toJoinRule() else JoinRuleOverride.None,
                 preset = if (config.roomVisibility is RoomVisibilityState.Public) RoomPreset.PUBLIC_CHAT else RoomPreset.PRIVATE_CHAT,
                 invite = config.invites.map { it.userId },
                 avatar = avatarUrl,
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 aeaf63b2c5..b966d98db6 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
@@ -7,6 +7,15 @@
 
 package io.element.android.features.createroom.impl.configureroom
 
+import io.element.android.libraries.matrix.api.createroom.JoinRuleOverride
+
 enum class RoomAccess {
     Anyone, Knocking
 }
+
+fun RoomAccess.toJoinRule(): JoinRuleOverride {
+    return when (this) {
+        RoomAccess.Anyone -> JoinRuleOverride.None
+        RoomAccess.Knocking -> JoinRuleOverride.Knock
+    }
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/CreateRoomParameters.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/CreateRoomParameters.kt
index 940fef7326..4c74153a31 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/CreateRoomParameters.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/CreateRoomParameters.kt
@@ -18,4 +18,5 @@ data class CreateRoomParameters(
     val preset: RoomPreset,
     val invite: List<UserId>? = null,
     val avatar: String? = null,
+    val joinRuleOverride: JoinRuleOverride = JoinRuleOverride.None,
 )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/JoinRuleOverride.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/JoinRuleOverride.kt
new file mode 100644
index 0000000000..f59f393c3e
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/JoinRuleOverride.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.createroom
+
+/**
+ * Rules to override the default room join rules.
+ */
+sealed interface JoinRuleOverride {
+    data object Knock : JoinRuleOverride
+    data object None : JoinRuleOverride
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index 101d049659..c73b3c50a6 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -21,6 +21,7 @@ import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.createroom.CreateRoomParameters
+import io.element.android.libraries.matrix.api.createroom.JoinRuleOverride
 import io.element.android.libraries.matrix.api.createroom.RoomPreset
 import io.element.android.libraries.matrix.api.createroom.RoomVisibility
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
@@ -108,6 +109,7 @@ import kotlin.jvm.optionals.getOrNull
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import org.matrix.rustcomponents.sdk.CreateRoomParameters as RustCreateRoomParameters
+import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule
 import org.matrix.rustcomponents.sdk.RoomPreset as RustRoomPreset
 import org.matrix.rustcomponents.sdk.RoomVisibility as RustRoomVisibility
 import org.matrix.rustcomponents.sdk.SyncService as ClientSyncService
@@ -304,14 +306,25 @@ class RustMatrixClient(
                     RoomVisibility.PUBLIC -> RustRoomVisibility.PUBLIC
                     RoomVisibility.PRIVATE -> RustRoomVisibility.PRIVATE
                 },
-                preset = when (createRoomParams.preset) {
-                    RoomPreset.PRIVATE_CHAT -> RustRoomPreset.PRIVATE_CHAT
-                    RoomPreset.PUBLIC_CHAT -> RustRoomPreset.PUBLIC_CHAT
-                    RoomPreset.TRUSTED_PRIVATE_CHAT -> RustRoomPreset.TRUSTED_PRIVATE_CHAT
+                preset = when (createRoomParams.visibility) {
+                    RoomVisibility.PRIVATE -> {
+                        if (createRoomParams.isDirect) {
+                            RustRoomPreset.TRUSTED_PRIVATE_CHAT
+                        } else {
+                            RustRoomPreset.PRIVATE_CHAT
+                        }
+                    }
+                    RoomVisibility.PUBLIC -> {
+                        RustRoomPreset.PUBLIC_CHAT
+                    }
                 },
                 invite = createRoomParams.invite?.map { it.value },
                 avatar = createRoomParams.avatar,
                 powerLevelContentOverride = defaultRoomCreationPowerLevels,
+                joinRuleOverride = when (createRoomParams.joinRuleOverride) {
+                    JoinRuleOverride.Knock -> RustJoinRule.Knock
+                    JoinRuleOverride.None -> null
+                }
             )
             val roomId = RoomId(client.createRoom(rustParams))
             // Wait to receive the room back from the sync but do not returns failure if it fails.