diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
index 46f38d062..3dca50c64 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
@@ -300,16 +300,14 @@ private fun RenderUserAsClickableText(
 ) {
     val userState by baseUser.live().userMetadataInfo.observeAsState()
 
-    userState?.bestName()?.let {
-        CreateClickableTextWithEmoji(
-            clickablePart = it,
-            suffix = additionalChars.ifBlank { null },
-            maxLines = 1,
-            route = "User/${baseUser.pubkeyHex}",
-            nav = nav,
-            tags = userState?.tags ?: EmptyTagList,
-        )
-    }
+    CreateClickableTextWithEmoji(
+        clickablePart = userState?.bestName() ?: ("@" + baseUser.pubkeyDisplayHex()),
+        suffix = additionalChars?.ifBlank { null },
+        maxLines = 1,
+        route = "User/${baseUser.pubkeyHex}",
+        nav = nav,
+        tags = userState?.tags ?: EmptyTagList,
+    )
 }
 
 @Composable