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 93adc5f6d..ff464d529 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
@@ -296,8 +296,8 @@ private fun RenderWordWithoutPreview(
 
     when (type) {
         // Don't preview Images
-        WordType.IMAGE -> UrlPreview(word, wordSpace)
-        WordType.LINK -> UrlPreview(word, wordSpace)
+        WordType.IMAGE -> ClickableUrl(wordSpace, word)
+        WordType.LINK -> ClickableUrl(wordSpace, word)
         WordType.EMOJI -> RenderCustomEmoji(word, state)
         // Don't offer to pay invoices
         WordType.INVOICE -> NormalWord(wordSpace)