diff --git a/damus/Util/Hashtags.swift b/damus/Util/Hashtags.swift
index be13b131..eabe5312 100644
--- a/damus/Util/Hashtags.swift
+++ b/damus/Util/Hashtags.swift
@@ -42,7 +42,7 @@ let custom_hashtags: [String: CustomHashtag] = [
 
 func hashtag_str(_ htag: String) -> CompatibleText {
     var attributedString = AttributedString(stringLiteral: "#\(htag)")
-    attributedString.link = URL(string: "damus:t:\(htag)")
+    attributedString.link = URL(string: "damus:t:\(htag.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed) ?? htag)")
     
     let lowertag = htag.lowercased()