diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index af9a25b52..b4dfb48c7 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -546,8 +546,8 @@ fun DisplayUncitedHashtags(
             hashtags.forEach {
                 if (!eventContent.contains(it, true)) {
                     ClickableText(
-                        text = AnnotatedString("#$it "),
-                        onClick = { navController.navigate("Hashtag/$it") },
+                        text = AnnotatedString("#$hashtag "),
+                        onClick = { navController.navigate("Hashtag/$hashtag") },
                         style = LocalTextStyle.current.copy(
                             color = MaterialTheme.colors.primary.copy(
                                 alpha = 0.52f