diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
index c6e7fd17..71c16eb4 100644
--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -602,9 +602,11 @@ def content_to_comment_html(content)
           text = %(<a href="/watch?v=#{video_id}">#{"youtube.com/watch?v=#{video_id}"}</a>)
         end
       elsif url = run.dig?("navigationEndpoint", "commandMetadata", "webCommandMetadata", "url").try &.as_s
-        if text.starts_with?(/\s?@/)
-          # Handle "pings" in comments differently
-          # See: https://github.com/iv-org/invidious/issues/3038
+        if text.starts_with?(/\s?[@#]/)
+          # Handle "pings" in comments and hasthags differently
+          # See:
+          #  - https://github.com/iv-org/invidious/issues/3038
+          #  - https://github.com/iv-org/invidious/issues/3062
           text = %(<a href="#{url}">#{text}</a>)
         else
           text = %(<a href="#{url}">#{reduce_uri(url)}</a>)