diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index c1bd41b884..53f5e3c85c 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -467,5 +467,6 @@ export default {
     MAX_USERNAME_LENGTH: 15,
     MIN_PASSWORD_LENGTH: 5,
     MAX_PASSWORD_LENGTH: 50,
-    TIME_SINCE_UPDATE_INTERVAL: 30000
+    TIME_SINCE_UPDATE_INTERVAL: 30000,
+    MIN_HASHTAG_LINK_LENGTH: 3
 };
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index e837ded537..dae2252a6c 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
         });