diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
index 286576e344..2a21518e83 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
@@ -67,7 +67,6 @@ import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.ui.components.DisplayNameWithStatus
 import io.element.android.libraries.matrix.ui.components.InviteSenderView
 import io.element.android.libraries.matrix.ui.model.InviteSender
-import io.element.android.libraries.matrix.ui.model.toEmojiText
 import io.element.android.libraries.ui.strings.CommonStrings
 import timber.log.Timber
 
@@ -233,7 +232,7 @@ private fun NameAndTimestampRow(
         val displayName = name?.toSafeLength(ellipsize = true) ?: stringResource(id = CommonStrings.common_no_room_name)
         DisplayNameWithStatus(
             name = displayName,
-            status = dmUserStatus?.toEmojiText(),
+            status = dmUserStatus,
             modifier = Modifier.weight(1f),
             style = ElementTheme.typography.fontBodyLgMedium,
             nameColor = ElementTheme.colors.roomListRoomName,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
index 9cc76b2458..d19061d8ed 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
@@ -43,7 +43,6 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.ui.components.DisplayNameWithStatus
 import io.element.android.libraries.matrix.ui.model.getAvatarData
-import io.element.android.libraries.matrix.ui.model.toEmojiText
 import io.element.android.libraries.slashcommands.api.SlashCommandSuggestion
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import kotlinx.collections.immutable.ImmutableList
@@ -120,8 +119,8 @@ private fun SuggestionItemView(
             is ResolvedSuggestion.Alias -> suggestion.roomName
             is ResolvedSuggestion.Command -> suggestion.command.command
         }
-        val statusEmoji = when (suggestion) {
-            is ResolvedSuggestion.Member -> suggestion.roomMember.displayedStatus?.toEmojiText()
+        val status = when (suggestion) {
+            is ResolvedSuggestion.Member -> suggestion.roomMember.displayedStatus
             else -> null
         }
         val details = when (suggestion) {
@@ -156,7 +155,7 @@ private fun SuggestionItemView(
                 title?.let {
                     DisplayNameWithStatus(
                         name = title,
-                        status = statusEmoji,
+                        status = status,
                         style = ElementTheme.typography.fontBodyLgRegular,
                         nameColor = ElementTheme.colors.textPrimary,
                     )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
index 67fb07e4d2..2daa90af53 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
@@ -51,7 +51,6 @@ import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.ui.components.DisplayNameWithStatus
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.matrix.ui.model.getAvatarData
-import io.element.android.libraries.matrix.ui.model.toEmojiText
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -163,7 +162,7 @@ private fun RoomAvatarAndNameRow(
         )
         DisplayNameWithStatus(
             name = roomName ?: stringResource(CommonStrings.common_no_room_name),
-            status = dmUserStatus?.toEmojiText(),
+            status = dmUserStatus,
             modifier = Modifier.padding(start = 8.dp),
             style = ElementTheme.typography.fontBodyLgMedium,
             nameColor = ElementTheme.colors.textPrimary,
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/DisplayNameWithStatus.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/DisplayNameWithStatus.kt
index 7c6e5854da..627b892fc5 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/DisplayNameWithStatus.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/DisplayNameWithStatus.kt
@@ -21,6 +21,8 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.ui.model.toEmojiText
 
 /**
  * Component to display side by side a display name and an optional status.
@@ -28,7 +30,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 @Composable
 fun DisplayNameWithStatus(
     name: String,
-    status: String?,
+    status: DisplayedStatus?,
     style: TextStyle,
     modifier: Modifier = Modifier,
     nameColor: Color = Color.Unspecified,
@@ -52,7 +54,7 @@ fun DisplayNameWithStatus(
         if (status != null) {
             Spacer(Modifier.width(4.dp))
             Text(
-                text = status,
+                text = status.toEmojiText(),
                 style = style,
                 color = ElementTheme.colors.textSecondary,
             )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
index 3132fe1140..89b0532580 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
@@ -31,7 +31,6 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.getBestName
-import io.element.android.libraries.matrix.ui.model.toEmojiText
 
 @Composable
 fun MatrixUserHeader(
@@ -60,9 +59,9 @@ fun MatrixUserHeader(
             // Name
             DisplayNameWithStatus(
                 name = matrixUser.getBestName(),
-                status = matrixUser.displayedStatus?.toEmojiText(),
+                status = matrixUser.displayedStatus,
                 nameColor = ElementTheme.colors.textPrimary,
-                style = ElementTheme.typography.fontHeadingMdRegular
+                style = ElementTheme.typography.fontHeadingMdRegular,
             )
             // Id
             if (matrixUser.displayName.isNullOrEmpty().not()) {
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt
index 7fa4fe4557..9fc7ea7b4a 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt
@@ -20,7 +20,6 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.getBestName
-import io.element.android.libraries.matrix.ui.model.toEmojiText
 
 @Composable
 fun MatrixUserRow(
@@ -34,7 +33,7 @@ fun MatrixUserRow(
     nameContent = {
         DisplayNameWithStatus(
             name = matrixUser.getBestName(),
-            status = matrixUser.displayedStatus?.toEmojiText(),
+            status = matrixUser.displayedStatus,
             nameColor = ElementTheme.colors.textPrimary,
             style = ElementTheme.typography.fontBodyLgRegular,
         )