diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt
index 67e697e8e4..164a82af62 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt
@@ -102,7 +102,10 @@ class CreateRoomDataStore @Inject constructor(
         createRoomConfigFlow.getAndUpdate { config ->
             config.copy(
                 roomVisibility = when (config.roomVisibility) {
-                    is RoomVisibilityState.Public -> config.roomVisibility.copy(roomAddress = RoomAddress.Edited(address))
+                    is RoomVisibilityState.Public -> {
+                        val sanitizedAddress = address.lowercase()
+                        config.roomVisibility.copy(roomAddress = RoomAddress.Edited(sanitizedAddress))
+                    }
                     else -> config.roomVisibility
                 }
             )
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 e34bb27a8b..fabbe2aecc 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
@@ -240,9 +240,9 @@ private fun RoomTopic(
         modifier = modifier,
         label = stringResource(R.string.screen_create_room_topic_label),
         value = topic,
-        placeholder = stringResource(CommonStrings.common_topic_placeholder),
         onValueChange = onTopicChange,
         maxLines = 3,
+        supportingText = stringResource(CommonStrings.common_topic_placeholder),
         keyboardOptions = KeyboardOptions(
             capitalization = KeyboardCapitalization.Sentences,
         ),