diff --git a/front-end/components/bloom.mjs b/front-end/components/bloom.mjs
index 0b4166c..bcffb41 100644
--- a/front-end/components/bloom.mjs
+++ b/front-end/components/bloom.mjs
@@ -36,12 +36,14 @@ const createBloom = (template, bloom) => {
 
 function _formatHashtags(text) {
   if (!text) return text;
+
   return text.replace(
-    /\B#[^#]+/g,
+    /\B#[a-zA-Z0-9_]+/g,
     (match) => `<a href="/hashtag/${match.slice(1)}">${match}</a>`
   );
 }
 
+
 function _formatTimestamp(timestamp) {
   if (!timestamp) return "";