diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageAuthorRow.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageAuthorRow.kt
index 2d62c5aabc6..e55396ae4c8 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageAuthorRow.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageAuthorRow.kt
@@ -82,17 +82,20 @@ fun MessageAuthorRow(
 
 @Composable
 private fun Username(username: String, accent: Accent, messageStyle: MessageStyle, modifier: Modifier = Modifier) {
+    val fallbackColor = if (messageStyle.isBubble()) {
+        if (accent == Accent.Unknown) {
+            MaterialTheme.wireColorScheme.wireAccentColors.get(Accent.Unknown)
+        } else {
+            MaterialTheme.wireColorScheme.primary
+        }
+    } else {
+        MaterialTheme.wireColorScheme.onBackground
+    }
+
     Text(
         text = username,
         style = MaterialTheme.wireTypography.body02,
-        color = MaterialTheme.wireColorScheme.wireAccentColors.getOrDefault(
-            accent,
-            if (messageStyle.isBubble()) {
-                MaterialTheme.wireColorScheme.primary
-            } else {
-                MaterialTheme.wireColorScheme.onBackground
-            }
-        ),
+        color = MaterialTheme.wireColorScheme.wireAccentColors.getOrDefault(accent, fallbackColor),
         modifier = modifier,
         maxLines = 1,
         overflow = TextOverflow.Ellipsis
diff --git a/core/ui-common/src/main/kotlin/com/wire/android/ui/common/avatar/UserProfileAvatar.kt b/core/ui-common/src/main/kotlin/com/wire/android/ui/common/avatar/UserProfileAvatar.kt
index 209eb689545..4652b6e4795 100644
--- a/core/ui-common/src/main/kotlin/com/wire/android/ui/common/avatar/UserProfileAvatar.kt
+++ b/core/ui-common/src/main/kotlin/com/wire/android/ui/common/avatar/UserProfileAvatar.kt
@@ -311,10 +311,7 @@ private fun DefaultInitialsAvatar(
                         colorsScheme().outline
                     )
                 } else {
-                    colorsScheme().wireAccentColors.getOrDefault(
-                        Accent.fromAccentId(nameBasedAvatar.accentColor),
-                        colorsScheme().secondaryText
-                    )
+                    colorsScheme().wireAccentColors.get(Accent.fromAccentId(nameBasedAvatar.accentColor))
                 }
             )
             .then(semantics)