diff --git a/webapp/utils/markdown.jsx b/webapp/utils/markdown.jsx
index 73af4ae91a..bd1e998b4a 100644
--- a/webapp/utils/markdown.jsx
+++ b/webapp/utils/markdown.jsx
@@ -163,7 +163,7 @@ class MattermostMarkdownRenderer extends marked.Renderer {
         }
 
         // remove any links added to the text by hashtag or mention parsing since they'll break this link
-        output += '>' + text.replace(/<\/?a[^>]*>/, '') + '</a>';
+        output += '>' + text.replace(/<\/?a[^>]*>/g, '') + '</a>';
 
         return output;
     }