diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
index 8ac5fe9e3..26d0448be 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
@@ -365,7 +365,7 @@ fun NoteMaster(
                             navController
                         )
 
-                        DisplayUncitedHashtags(noteEvent, eventContent, navController)
+                        DisplayUncitedHashtags(noteEvent.hashtags(), eventContent, navController)
 
                         if (noteEvent is PollNoteEvent) {
                             PollNote(