diff --git a/src/components/ProfileViewer.tsx b/src/components/ProfileViewer.tsx
index f607b82..046ca93 100644
--- a/src/components/ProfileViewer.tsx
+++ b/src/components/ProfileViewer.tsx
@@ -413,7 +413,12 @@ export function ProfileViewer({ pubkey }: ProfileViewerProps) {
                 </div>
                 <RichText
                   className="text-sm whitespace-pre-wrap break-words"
-                  content={profile.about}
+                  event={
+                    profileEvent
+                      ? { ...profileEvent, content: profile.about }
+                      : undefined
+                  }
+                  content={profileEvent ? undefined : profile.about}
                 />
               </div>
             )}
diff --git a/src/components/nostr/compact/GenericRepostCompactPreview.tsx b/src/components/nostr/compact/GenericRepostCompactPreview.tsx
index cb7baa2..9d1842a 100644
--- a/src/components/nostr/compact/GenericRepostCompactPreview.tsx
+++ b/src/components/nostr/compact/GenericRepostCompactPreview.tsx
@@ -53,7 +53,7 @@ export function GenericRepostCompactPreview({ event }: { event: NostrEvent }) {
           />
           <span className="truncate line-clamp-1">
             <RichText
-              content={preview || ""}
+              event={{ ...repostedEvent, content: preview || "" }}
               className="inline text-sm leading-none"
               options={{ showMedia: false, showEventEmbeds: false }}
             />
diff --git a/src/components/nostr/compact/index.tsx b/src/components/nostr/compact/index.tsx
index 90c62f7..c461f5a 100644
--- a/src/components/nostr/compact/index.tsx
+++ b/src/components/nostr/compact/index.tsx
@@ -77,7 +77,7 @@ export function DefaultCompactPreview({ event }: { event: NostrEvent }) {
     <span className="truncate line-clamp-1 text-muted-foreground text-sm">
       {hasSpecificTitle ? (
         <RichText
-          content={title}
+          event={{ ...event, content: title }}
           className="inline text-sm leading-none"
           options={{ showMedia: false, showEventEmbeds: false }}
         />
diff --git a/src/components/nostr/kinds/FileMetadataRenderer.tsx b/src/components/nostr/kinds/FileMetadataRenderer.tsx
index df4ede4..004cb7a 100644
--- a/src/components/nostr/kinds/FileMetadataRenderer.tsx
+++ b/src/components/nostr/kinds/FileMetadataRenderer.tsx
@@ -103,7 +103,12 @@ export function Kind1063Renderer({ event }: BaseEventProps) {
         </div>
 
         {/* Description/Summary */}
-        {summary && <RichText content={summary} className="text-sm" />}
+        {summary && (
+          <RichText
+            event={{ ...event, content: summary }}
+            className="text-sm"
+          />
+        )}
 
         {/* Download button */}
         {metadata.url && (
diff --git a/src/components/nostr/kinds/HighlightRenderer.tsx b/src/components/nostr/kinds/HighlightRenderer.tsx
index 89e1782..ea22f87 100644
--- a/src/components/nostr/kinds/HighlightRenderer.tsx
+++ b/src/components/nostr/kinds/HighlightRenderer.tsx
@@ -100,7 +100,7 @@ export function Kind9802Renderer({ event }: BaseEventProps) {
                 onClick={handleOpenEvent}
               >
                 <RichText
-                  content={sourcePreview}
+                  event={{ ...sourceEvent, content: sourcePreview }}
                   options={{ showMedia: false, showEventEmbeds: false }}
                 />
               </div>
diff --git a/src/components/nostr/kinds/ProfileRenderer.tsx b/src/components/nostr/kinds/ProfileRenderer.tsx
index c8a6c11..71a8cd0 100644
--- a/src/components/nostr/kinds/ProfileRenderer.tsx
+++ b/src/components/nostr/kinds/ProfileRenderer.tsx
@@ -40,7 +40,7 @@ export function Kind0Renderer({ event }: BaseEventProps) {
           {/* About */}
           {about && (
             <p className="text-sm text-muted-foreground line-clamp-5">
-              <RichText content={about} />
+              <RichText event={{ ...event, content: about }} />
             </p>
           )}