diff --git a/app/RSpade/Core/Js/functions.js b/app/RSpade/Core/Js/functions.js
index bce7a5a35..2c03fbd72 100755
--- a/app/RSpade/Core/Js/functions.js
+++ b/app/RSpade/Core/Js/functions.js
@@ -532,13 +532,24 @@ function _linkify_content(content, new_window) {
         return '<a href="' + url + '"' + target + '>' + url + '</a>' + trailing;
     });
 
-    // Then, replace domain-like text (but not if already inside an href)
-    content = content.replace(domain_pattern, (match) => {
-        // Clean trailing punctuation
-        const domain = match.replace(/[.,;:!?)'\"]+$/, '');
-        const trailing = match.slice(domain.length);
-        return '<a href="https://' + domain + '"' + target + '>' + domain + '</a>' + trailing;
-    });
+    // Then, replace domain-like text only in segments NOT inside <a> tags
+    // (the URL replacement above may have created <a> tags)
+    const link_pattern = /(<a\s[^>]*>.*?<\/a>)/gi;
+    const segments = content.split(link_pattern);
+
+    content = segments.map(segment => {
+        // Skip segments that are already links
+        if (/^<a\s/i.test(segment)) {
+            return segment;
+        }
+        // Apply domain pattern to non-link segments
+        return segment.replace(domain_pattern, (match) => {
+            // Clean trailing punctuation
+            const domain = match.replace(/[.,;:!?)'\"]+$/, '');
+            const trailing = match.slice(domain.length);
+            return '<a href="https://' + domain + '"' + target + '>' + domain + '</a>' + trailing;
+        });
+    }).join('');
 
     return content;
 }
diff --git a/app/RSpade/helpers.php b/app/RSpade/helpers.php
index 8a699e9c3..d7be19572 100644
--- a/app/RSpade/helpers.php
+++ b/app/RSpade/helpers.php
@@ -1659,14 +1659,26 @@ function _linkify_content(string $content, bool $new_window): string
         return '<a href="' . $url . '"' . $target . '>' . $url . '</a>';
     }, $content);
 
-    // Then, replace domain-like text (but not if already inside an href)
-    $content = preg_replace_callback($domain_pattern, function ($matches) use ($target) {
-        $domain = $matches[1];
-        // Clean trailing punctuation
-        $domain = rtrim($domain, '.,;:!?)\'\"');
-        // Don't linkify if it looks like it's already in an href attribute
-        return '<a href="https://' . $domain . '"' . $target . '>' . $domain . '</a>';
-    }, $content);
+    // Then, replace domain-like text only in segments NOT inside <a> tags
+    // (the URL replacement above may have created <a> tags)
+    $link_pattern = '/(<a\s[^>]*>.*?<\/a>)/is';
+    $segments = preg_split($link_pattern, $content, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-    return $content;
+    $result = '';
+    foreach ($segments as $segment) {
+        // Skip segments that are already links
+        if (preg_match('/^<a\s/i', $segment)) {
+            $result .= $segment;
+        } else {
+            // Apply domain pattern to non-link segments
+            $result .= preg_replace_callback($domain_pattern, function ($matches) use ($target) {
+                $domain = $matches[1];
+                // Clean trailing punctuation
+                $domain = rtrim($domain, '.,;:!?)\'\"');
+                return '<a href="https://' . $domain . '"' . $target . '>' . $domain . '</a>';
+            }, $segment);
+        }
+    }
+
+    return $result;
 }