diff --git a/app/javascript/flavours/glitch/components/status/handled_link.tsx b/app/javascript/flavours/glitch/components/status/handled_link.tsx
index cd1fe0b74b..3541b09cbf 100644
--- a/app/javascript/flavours/glitch/components/status/handled_link.tsx
+++ b/app/javascript/flavours/glitch/components/status/handled_link.tsx
@@ -133,12 +133,14 @@ export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
 
   // Handle hashtags
   if (
-    text.startsWith('#') ||
-    prevText?.endsWith('#') ||
-    text.startsWith('＃') ||
-    prevText?.endsWith('＃')
+    (text.startsWith('#') ||
+      prevText?.endsWith('#') ||
+      text.startsWith('＃') ||
+      prevText?.endsWith('＃')) &&
+    !text.includes('%')
   ) {
     const hashtag = text.slice(1).trim();
+
     return (
       <Link
         className={classNames('mention hashtag', className)}
@@ -192,7 +194,7 @@ export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
   return (
     <a
       {...props}
-      href={href}
+      href={encodeURI(href)}
       title={href}
       className={classNames('unhandled-link', className)}
       target='_blank'