1 files changed, 7 insertions, 1 deletions
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index e837ded53..dae2252a6 100644
--- a/web/react/utils/text_formatting.jsx
+++ b/web/react/utils/text_formatting.jsx
@@ -248,8 +248,14 @@ function autolinkHashtags(text, tokens) {
         const index = tokens.size;
         const alias = `MM_HASHTAG${index}`;
 
+        let value = hashtag;
+
+        if (hashtag.length > Constants.MIN_HASHTAG_LINK_LENGTH) {
+            value = `<a class='mention-link' href='#' data-hashtag='${hashtag}'>${hashtag}</a>`;
+        }
+
         tokens.set(alias, {
-            value: `<a class='mention-link' href='#' data-hashtag='${hashtag}'>${hashtag}</a>`,
+            value,
             originalText: hashtag
         });