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