diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt
index 513a86a22..05399c493 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt
@@ -332,13 +332,15 @@ class RichTextParser {
             }
         }
 
-        if (urls.withoutScheme.contains(word) || urls.withScheme.contains(word)) {
+        if (urls.withoutScheme.contains(word)) {
             parseNowhereLink(word)?.let { return it }
+            return SchemelessUrlSegment(word)
         }
 
-        if (urls.withoutScheme.contains(word)) return SchemelessUrlSegment(word)
-
-        if (urls.withScheme.contains(word)) return LinkSegment(word)
+        if (urls.withScheme.contains(word)) {
+            parseNowhereLink(word)?.let { return it }
+            return LinkSegment(word)
+        }
 
         if (urls.emails.contains(word)) return EmailSegment(word)