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 369021181..a811c8b2e 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
@@ -231,14 +231,6 @@ fun HashTag(word: String, accountViewModel: AccountViewModel, navController: Nav
                 ) {
                     append("#$tag")
                 }
-                if (suffix != null) {
-                    withStyle(
-                        LocalTextStyle.current.copy(color = MaterialTheme.colors.onBackground)
-                            .toSpanStyle()
-                    ) {
-                        append(suffix)
-                    }
-                }
             },
             onClick = { navController.navigate("Hashtag/$tag") }
         )
@@ -252,7 +244,7 @@ fun HashTag(word: String, accountViewModel: AccountViewModel, navController: Nav
             )
         }
 
-        Text(text = " ")
+        Text(text = "$suffix ")
     } else {
         Text(text = "$word ")
     }