diff --git a/damus/Models/Mentions.swift b/damus/Models/Mentions.swift
index 4c4dd6cc..e9a38042 100644
--- a/damus/Models/Mentions.swift
+++ b/damus/Models/Mentions.swift
@@ -264,7 +264,7 @@ func make_post_tags(post_blocks: [PostBlock], tags: [[String]]) -> PostTags {
                 blocks.append(block)
             }
         case .hashtag(let hashtag):
-            new_tags.append(["hashtag", hashtag.lowercased()])
+            new_tags.append(["t", hashtag.lowercased()])
             blocks.append(.hashtag(hashtag))
         case .text(let txt):
             blocks.append(Block.text(txt))
diff --git a/damus/Nostr/NostrFilter.swift b/damus/Nostr/NostrFilter.swift
index 693d9f70..7a53183f 100644
--- a/damus/Nostr/NostrFilter.swift
+++ b/damus/Nostr/NostrFilter.swift
@@ -23,7 +23,7 @@ struct NostrFilter: Codable {
         case kinds
         case referenced_ids = "#e"
         case pubkeys = "#p"
-        case hashtag = "#hashtag"
+        case hashtag = "#t"
         case since
         case until
         case authors
diff --git a/damus/Views/NoteContentView.swift b/damus/Views/NoteContentView.swift
index 34fc532e..c95998cc 100644
--- a/damus/Views/NoteContentView.swift
+++ b/damus/Views/NoteContentView.swift
@@ -63,7 +63,7 @@ struct NoteContentView: View {
 }
 
 func hashtag_str(_ htag: String) -> String {
-    return "[#\(htag)](nostr:hashtag:\(htag))"
+    return "[#\(htag)](nostr:t:\(htag))"
 }
 
 func mention_str(_ m: Mention, profiles: Profiles) -> String {
diff --git a/damus/Views/ThreadView.swift b/damus/Views/ThreadView.swift
index de867b12..b3e741e7 100644
--- a/damus/Views/ThreadView.swift
+++ b/damus/Views/ThreadView.swift
@@ -80,6 +80,7 @@ func should_show_chatroom(_ ev: NostrEvent) -> Bool {
 }
 
 func tag_is_hashtag(_ tag: [String]) -> Bool {
+    // "hashtag" is deprecated, will remove in the future
     return tag.count >= 2 && (tag[0] == "hashtag" || tag[0] == "t")
 }
 
diff --git a/damusTests/damusTests.swift b/damusTests/damusTests.swift
index c313f81c..79a45aff 100644
--- a/damusTests/damusTests.swift
+++ b/damusTests/damusTests.swift
@@ -79,9 +79,9 @@ class damusTests: XCTestCase {
         
         XCTAssertEqual(ev.tags.count, 2)
         XCTAssertEqual(ev.content, "#damus some content #bitcoin derp")
-        XCTAssertEqual(ev.tags[0][0], "hashtag")
+        XCTAssertEqual(ev.tags[0][0], "t")
         XCTAssertEqual(ev.tags[0][1], "damus")
-        XCTAssertEqual(ev.tags[1][0], "hashtag")
+        XCTAssertEqual(ev.tags[1][0], "t")
         XCTAssertEqual(ev.tags[1][1], "bitcoin")
         
     }