diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index 8c63810cde..96da542175 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -11,6 +11,12 @@ export class MattermostMarkdownRenderer extends marked.Renderer {
             outHref = `http://${outHref}`;
         }
 
-        return super.link(outHref, title, text);
+        let output = '<a class="theme" href="' + outHref + '"';
+        if (title) {
+            output += ' title="' + title + '"';
+        }
+        output += '>' + text + '</a>';
+
+        return output;
     }
 }