diff --git a/front-end/components/bloom.mjs b/front-end/components/bloom.mjs
index 0b4166c3..f770d18f 100644
--- a/front-end/components/bloom.mjs
+++ b/front-end/components/bloom.mjs
@@ -37,8 +37,8 @@ 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>`
+    /\B#[\w-]+/g,
+    (match) => `<a href="/hashtag/${encodeURIComponent(match.slice(1))}">${match}</a>`
   );
 }