diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
index f088603d3b..f196b2495e 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
@@ -137,7 +137,7 @@ internal fun RoomDescription.toContentState(): ContentState {
 @VisibleForTesting
 internal fun MatrixRoomInfo.toContentState(): ContentState {
     return ContentState.Loaded(
-        roomId = RoomId(id),
+        roomId = id,
         name = name,
         topic = topic,
         alias = canonicalAlias,
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
index 08591c068e..98962b9b8d 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
@@ -20,6 +20,7 @@ import androidx.compose.runtime.Immutable
 import io.element.android.features.invite.api.response.AcceptDeclineInviteState
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 
 @Immutable
@@ -41,7 +42,7 @@ sealed interface ContentState {
         val roomId: RoomId,
         val name: String?,
         val topic: String?,
-        val alias: String?,
+        val alias: RoomAlias?,
         val numberOfMembers: Long?,
         val isDirect: Boolean,
         val roomAvatarUrl: String?,
@@ -50,7 +51,7 @@ sealed interface ContentState {
         val computedTitle = name ?: roomId.value
 
         val computedSubtitle = when {
-            alias != null -> alias
+            alias != null -> alias.value
             name == null -> ""
             else -> roomId.value
         }
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
index 82b81d8e7b..2249b2865e 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
@@ -19,6 +19,7 @@ package io.element.android.features.joinroom.impl
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.invite.api.response.AcceptDeclineInviteState
 import io.element.android.features.invite.api.response.anAcceptDeclineInviteState
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 
 open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
@@ -49,7 +50,7 @@ fun aLoadingContentState(roomId: RoomId = A_ROOM_ID) = ContentState.Loading(room
 fun aLoadedContentState(
     roomId: RoomId = A_ROOM_ID,
     name: String = "Element X android",
-    alias: String? = "#exa:matrix.org",
+    alias: RoomAlias? = RoomAlias("#exa:matrix.org"),
     topic: String? = "Element X is a secure, private and decentralized messenger.",
     numberOfMembers: Long? = null,
     isDirect: Boolean = false,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
index 4edc943a73..2b74cf1072 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
@@ -258,7 +258,7 @@ class MessagesPresenter @AssistedInject constructor(
 
     private fun MatrixRoomInfo.avatarData(): AvatarData {
         return AvatarData(
-            id = id,
+            id = id.value,
             name = name,
             url = avatarUrl ?: room.avatarUrl,
             size = AvatarSize.TimelineRoom
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
index f0c96e74e2..c8b0f49346 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@@ -128,7 +128,7 @@ class RoomDetailsPresenter @Inject constructor(
         val roomMemberDetailsState = roomMemberDetailsPresenter?.present()
 
         return RoomDetailsState(
-            roomId = room.roomId.value,
+            roomId = room.roomId,
             roomName = roomName,
             roomAlias = room.alias,
             roomAvatarUrl = roomAvatar,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
index f5abc5bcce..ebdd524ed6 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
@@ -18,13 +18,15 @@ package io.element.android.features.roomdetails.impl
 
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsState
+import io.element.android.libraries.matrix.api.core.RoomAlias
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationSettings
 
 data class RoomDetailsState(
-    val roomId: String,
+    val roomId: RoomId,
     val roomName: String,
-    val roomAlias: String?,
+    val roomAlias: RoomAlias?,
     val roomAvatarUrl: String?,
     val roomTopic: RoomTopicState,
     val memberCount: Long,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
index 06b7ea7be7..f398a6704b 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
@@ -21,6 +21,8 @@ import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.leaveroom.api.aLeaveRoomState
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsState
 import io.element.android.features.roomdetails.impl.members.details.aRoomMemberDetailsState
+import io.element.android.libraries.matrix.api.core.RoomAlias
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
@@ -71,9 +73,9 @@ fun aDmRoomMember(
 )
 
 fun aRoomDetailsState(
-    roomId: String = "a room id",
+    roomId: RoomId = RoomId("!aRoomId:domain.com"),
     roomName: String = "Marketing",
-    roomAlias: String? = "#marketing:domain.com",
+    roomAlias: RoomAlias? = RoomAlias("#marketing:domain.com"),
     roomAvatarUrl: String? = null,
     roomTopic: RoomTopicState = RoomTopicState.ExistingTopic(
         "Welcome to #marketing, home of the Marketing team " +
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index ff4ece7bde..fc49bb383a 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -78,6 +78,8 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.utils.CommonDrawables
+import io.element.android.libraries.matrix.api.core.RoomAlias
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.getBestName
@@ -302,9 +304,9 @@ private fun MainActionsSection(
 @Composable
 private fun RoomHeaderSection(
     avatarUrl: String?,
-    roomId: String,
+    roomId: RoomId,
     roomName: String,
-    roomAlias: String?,
+    roomAlias: RoomAlias?,
     openAvatarPreview: (url: String) -> Unit,
 ) {
     Column(
@@ -314,7 +316,7 @@ private fun RoomHeaderSection(
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Avatar(
-            avatarData = AvatarData(roomId, roomName, avatarUrl, AvatarSize.RoomHeader),
+            avatarData = AvatarData(roomId.value, roomName, avatarUrl, AvatarSize.RoomHeader),
             modifier = Modifier
                 .size(70.dp)
                 .clickable(enabled = avatarUrl != null) { openAvatarPreview(avatarUrl!!) }
@@ -329,7 +331,7 @@ private fun RoomHeaderSection(
         if (roomAlias != null) {
             Spacer(modifier = Modifier.height(6.dp))
             Text(
-                text = roomAlias,
+                text = roomAlias.value,
                 style = ElementTheme.typography.fontBodyLgRegular,
                 color = MaterialTheme.colorScheme.secondary,
                 textAlign = TextAlign.Center,
diff --git a/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt b/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt
index a27f413e9b..909c34f959 100644
--- a/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt
+++ b/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt
@@ -20,6 +20,7 @@ import android.os.Parcelable
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
@@ -29,7 +30,7 @@ import kotlinx.parcelize.Parcelize
 data class RoomDescription(
     val roomId: RoomId,
     val name: String?,
-    val alias: String?,
+    val alias: RoomAlias?,
     val topic: String?,
     val avatarUrl: String?,
     val joinRule: JoinRule,
@@ -42,14 +43,14 @@ data class RoomDescription(
     }
 
     @IgnoredOnParcel
-    val computedName = name ?: alias ?: roomId.value
+    val computedName = name ?: alias?.value ?: roomId.value
 
     @IgnoredOnParcel
     val computedDescription: String
         get() {
             return when {
                 topic != null -> topic
-                name != null && alias != null -> alias
+                name != null && alias != null -> alias.value
                 name == null && alias == null -> ""
                 else -> roomId.value
             }
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStateProvider.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStateProvider.kt
index e94271cfb8..bf682fc15b 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStateProvider.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStateProvider.kt
@@ -19,6 +19,7 @@ package io.element.android.features.roomdirectory.impl.root
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -69,7 +70,7 @@ fun aRoomDescriptionList(): ImmutableList<RoomDescription> {
             roomId = RoomId("!exa:matrix.org"),
             name = "Element X Android",
             topic = "Element X is a secure, private and decentralized messenger.",
-            alias = "#element-x-android:matrix.org",
+            alias = RoomAlias("#element-x-android:matrix.org"),
             avatarUrl = null,
             joinRule = RoomDescription.JoinRule.PUBLIC,
             numberOfMembers = 2765,
@@ -78,7 +79,7 @@ fun aRoomDescriptionList(): ImmutableList<RoomDescription> {
             roomId = RoomId("!exi:matrix.org"),
             name = "Element X iOS",
             topic = "Element X is a secure, private and decentralized messenger.",
-            alias = "#element-x-ios:matrix.org",
+            alias = RoomAlias("#element-x-ios:matrix.org"),
             avatarUrl = null,
             joinRule = RoomDescription.JoinRule.UNKNOWN,
             numberOfMembers = 356,
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
index 761d87445a..5c28b84c01 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
@@ -18,6 +18,7 @@ package io.element.android.libraries.matrix.api.room
 
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.ProgressCallback
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.TransactionId
@@ -45,8 +46,8 @@ interface MatrixRoom : Closeable {
     val roomId: RoomId
     val name: String?
     val displayName: String
-    val alias: String?
-    val alternativeAliases: List<String>
+    val alias: RoomAlias?
+    val alternativeAliases: List<RoomAlias>
     val topic: String?
     val avatarUrl: String?
     val isEncrypted: Boolean
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/preview/RoomPreview.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/preview/RoomPreview.kt
index 8ee7550b74..ad16561380 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/preview/RoomPreview.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/preview/RoomPreview.kt
@@ -16,13 +16,14 @@
 
 package io.element.android.libraries.matrix.api.room.preview
 
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 
 data class RoomPreview(
     /** The room id for this room. */
     val roomId: RoomId,
     /** The canonical alias for the room. */
-    val canonicalAlias: String?,
+    val canonicalAlias : RoomAlias?,
     /** The room's name, if set. */
     val name: String?,
     /** The room's topic, if set. */
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt
index 78d6cb0c94..75d203e0b7 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt
@@ -16,13 +16,14 @@
 
 package io.element.android.libraries.matrix.api.roomdirectory
 
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 
 data class RoomDescription(
     val roomId: RoomId,
     val name: String?,
     val topic: String?,
-    val alias: String?,
+    val alias: RoomAlias?,
     val avatarUrl: String?,
     val joinRule: JoinRule,
     val isWorldReadable: Boolean,
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
index b7955a9c79..2ab50630a1 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.matrix.api.roomlist
 
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -37,7 +38,7 @@ sealed interface RoomSummary {
 data class RoomSummaryDetails(
     val roomId: RoomId,
     val name: String,
-    val canonicalAlias: String?,
+    val canonicalAlias: RoomAlias?,
     val isDirect: Boolean,
     val avatarUrl: String?,
     val lastMessage: RoomMessage?,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
index 59e5c99efa..97035f0583 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -20,6 +20,7 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.childScope
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.ProgressCallback
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.TransactionId
@@ -205,11 +206,11 @@ class RustMatrixRoom(
     override val isEncrypted: Boolean
         get() = runCatching { innerRoom.isEncrypted() }.getOrDefault(false)
 
-    override val alias: String?
-        get() = runCatching { innerRoom.canonicalAlias() }.getOrDefault(null)
+    override val alias: RoomAlias?
+        get() = runCatching { innerRoom.canonicalAlias()?.let(::RoomAlias) }.getOrDefault(null)
 
-    override val alternativeAliases: List<String>
-        get() = runCatching { innerRoom.alternativeAliases() }.getOrDefault(emptyList())
+    override val alternativeAliases: List<RoomAlias>
+        get() = runCatching { innerRoom.alternativeAliases().map { RoomAlias(it) } }.getOrDefault(emptyList())
 
     override val isPublic: Boolean
         get() = runCatching { innerRoom.isPublic() }.getOrDefault(false)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewMapper.kt
index fb18205978..75286becda 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewMapper.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.matrix.impl.room.preview
 
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.preview.RoomPreview
 import org.matrix.rustcomponents.sdk.RoomPreview as RustRoomPreview
@@ -24,7 +25,7 @@ object RoomPreviewMapper {
     fun map(roomPreview: RustRoomPreview): RoomPreview {
         return RoomPreview(
             roomId = RoomId(roomPreview.roomId),
-            canonicalAlias = roomPreview.canonicalAlias,
+            canonicalAlias = roomPreview.canonicalAlias?.let(::RoomAlias),
             name = roomPreview.name,
             topic = roomPreview.topic,
             avatarUrl = roomPreview.avatarUrl,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt
index 876a58d3a5..b256f589f4 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.matrix.impl.roomdirectory
 
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDescription
 import org.matrix.rustcomponents.sdk.PublicRoomJoinRule
@@ -28,7 +29,7 @@ class RoomDescriptionMapper {
             name = roomDescription.name,
             topic = roomDescription.topic,
             avatarUrl = roomDescription.avatarUrl,
-            alias = roomDescription.alias,
+            alias = roomDescription.alias?.let(::RoomAlias),
             joinRule = when (roomDescription.joinRule) {
                 PublicRoomJoinRule.PUBLIC -> RoomDescription.JoinRule.PUBLIC
                 PublicRoomJoinRule.KNOCK -> RoomDescription.JoinRule.KNOCK
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt
index 834c49ac2a..a70030cc70 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.matrix.impl.roomlist
 
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.impl.notificationsettings.RoomNotificationSettingsMapper
@@ -33,7 +34,7 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
         return RoomSummaryDetails(
             roomId = RoomId(roomInfo.id),
             name = roomInfo.name ?: roomInfo.id,
-            canonicalAlias = roomInfo.canonicalAlias,
+            canonicalAlias = roomInfo.canonicalAlias?.let(::RoomAlias),
             isDirect = roomInfo.isDirect,
             avatarUrl = roomInfo.avatarUrl,
             numUnreadMentions = roomInfo.numUnreadMentions.toInt(),
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
index ee3e1137bb..830ac3a6e2 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
@@ -75,8 +75,8 @@ class FakeMatrixRoom(
     override val topic: String? = null,
     override val avatarUrl: String? = null,
     override val isEncrypted: Boolean = false,
-    override val alias: String? = null,
-    override val alternativeAliases: List<String> = emptyList(),
+    override val alias: RoomAlias? = null,
+    override val alternativeAliases: List<RoomAlias> = emptyList(),
     override val isPublic: Boolean = true,
     override val isSpace: Boolean = false,
     override val isDirect: Boolean = false,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
index b9b078c5f3..6b9383ef05 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
@@ -17,6 +17,7 @@
 package io.element.android.libraries.matrix.test.room
 
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
@@ -72,7 +73,7 @@ fun aRoomSummaryDetails(
     isMarkedUnread: Boolean = false,
     notificationMode: RoomNotificationMode? = null,
     inviter: RoomMember? = null,
-    canonicalAlias: String? = null,
+    canonicalAlias: RoomAlias? = null,
     hasRoomCall: Boolean = false,
     isDm: Boolean = false,
     isFavorite: Boolean = false,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt
index 6e96ca4452..174f5f7f0c 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.matrix.test.roomdirectory
 
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDescription
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -24,7 +25,7 @@ fun aRoomDescription(
     roomId: RoomId = A_ROOM_ID,
     name: String? = null,
     topic: String? = null,
-    alias: String? = null,
+    alias: RoomAlias? = null,
     avatarUrl: String? = null,
     joinRule: RoomDescription.JoinRule = RoomDescription.JoinRule.UNKNOWN,
     isWorldReadable: Boolean = true,
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
index 4caad93b46..4b7c17a1ec 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
@@ -43,6 +43,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -106,7 +107,7 @@ internal fun SelectedRoomPreview() = ElementPreview {
 fun aRoomSummaryDetails(
     roomId: RoomId = RoomId("!room:domain"),
     name: String = "roomName",
-    canonicalAlias: String? = null,
+    canonicalAlias: RoomAlias? = null,
     isDirect: Boolean = true,
     avatarUrl: String? = null,
     lastMessage: RoomMessage? = null,
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt
index ecd13338ca..f0daf8b7fa 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt
@@ -18,6 +18,7 @@ package io.element.android.libraries.roomselect.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.ui.components.aRoomSummaryDetails
@@ -65,6 +66,6 @@ private fun aForwardMessagesRoomList() = persistentListOf(
     aRoomSummaryDetails(
         roomId = RoomId("!room2:domain"),
         name = "Room with alias",
-        canonicalAlias = "#alias:example.org",
+        canonicalAlias = RoomAlias("#alias:example.org"),
     ),
 )
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
index b2c703fdb1..eb6143107f 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
@@ -243,7 +243,7 @@ private fun RoomSummaryView(
             // Alias
             summary.canonicalAlias?.let { alias ->
                 Text(
-                    text = alias,
+                    text = alias.value,
                     color = ElementTheme.colors.textSecondary,
                     style = ElementTheme.typography.fontBodySmRegular,
                     maxLines = 1,