diff --git a/front-end/components/bloom.mjs b/front-end/components/bloom.mjs
index 0b4166c..3d88fe9 100644
--- a/front-end/components/bloom.mjs
+++ b/front-end/components/bloom.mjs
@@ -37,8 +37,12 @@ const createBloom = (template, bloom) => {
 function _formatHashtags(text) {
   if (!text) return text;
   return text.replace(
-    /\B#[^#]+/g,
-    (match) => `<a href="/hashtag/${match.slice(1)}">${match}</a>`
+    /(^|\s)#[^#\s]+/g,
+    (match) => {
+      const space = match.startsWith(' ') ? ' ' : '';
+      const tag = match.trim().slice(1);
+      return `${space}<a href="/hashtag/${tag}">#${tag}</a>`;
+    }
   );
 }