diff --git a/nostrdb/NdbBlock.swift b/nostrdb/NdbBlock.swift
index b38607a3..08b71bd6 100644
--- a/nostrdb/NdbBlock.swift
+++ b/nostrdb/NdbBlock.swift
@@ -120,6 +120,9 @@ struct NdbBlockGroup: ~Copyable {
         if event.is_content_encrypted() {
             return try parse(event: event, keypair: keypair)
         }
+        else if event.known_kind == .highlight {
+            return try parse(event: event, keypair: keypair)
+        }
         else {
             guard let offsets = event.block_offsets(ndb: ndb) else {
                 return try parse(event: event, keypair: keypair)
diff --git a/nostrdb/NdbNote.swift b/nostrdb/NdbNote.swift
index 9c36eeb5..4ec2345b 100644
--- a/nostrdb/NdbNote.swift
+++ b/nostrdb/NdbNote.swift
@@ -489,6 +489,9 @@ extension NdbNote {
         if is_content_encrypted() {
             return decrypted(keypair: keypair)
         }
+        else if known_kind == .highlight {
+            return self.referenced_comment_items.first?.content
+        }
 
         return content
     }