diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
index 856f3a7ee..9fb65f58e 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
@@ -183,10 +183,11 @@ fun TagLink(word: String, tags: List<List<String>>, accountViewModel: AccountVie
         if (user != null) {
           ClickableUserTag(user, navController)
         } else {
-          Text(text = "${tags[index][1].toByteArray().toNpub().toShortenHex()} ")
+          Text(text = "$word ")
         }
       } else {
-        Text(text = "${tags[index][1].toByteArray().toNpub().toShortenHex()} ")
+        // if here the tag is not a valid Nostr Hex
+        Text(text = "$word ")
       }
     } else if (tags[index][0] == "e") {
       val note = LocalCache.checkGetOrCreateNote(tags[index][1])
@@ -208,11 +209,10 @@ fun TagLink(word: String, tags: List<List<String>>, accountViewModel: AccountVie
           isQuotedNote = true,
           navController = navController)
       } else {
-        Text(text = "${tags[index][1].toByteArray().toNote().toShortenHex()} ")
+        // if here the tag is not a valid Nostr Hex
+        Text(text = "$word ")
       }
     } else
       Text(text = "$word ")
   }
 }
-
-