diff --git a/packages/app/src/Element/Text.tsx b/packages/app/src/Element/Text.tsx
index eba63cc..0e13507 100644
--- a/packages/app/src/Element/Text.tsx
+++ b/packages/app/src/Element/Text.tsx
@@ -81,13 +81,15 @@ export default function Text({ content, tags, creator }: TextProps) {
                   }
                   case "e": {
                     const eText = hexToBech32("note", ref.Event).substring(0, 12);
-                    return (
+                    return ref.Event ? (
                       <Link
-                        to={eventLink(ref.Event ?? "")}
+                        to={eventLink(ref.Event)}
                         onClick={e => e.stopPropagation()}
                         state={{ from: location.pathname }}>
                         #{eText}
                       </Link>
+                    ) : (
+                      ""
                     );
                   }
                   case "t": {
diff --git a/packages/app/src/Feed/EventPublisher.ts b/packages/app/src/Feed/EventPublisher.ts
index ce8c94f..b8c53a4 100644
--- a/packages/app/src/Feed/EventPublisher.ts
+++ b/packages/app/src/Feed/EventPublisher.ts
@@ -76,7 +76,7 @@ export default function useEventPublisher() {
     };
     const content = msg
       .replace(/@npub[a-z0-9]+/g, replaceNpub)
-      .replace(/note[a-z0-9]+/g, replaceNoteId)
+      .replace(/note1[acdefghjklmnpqrstuvwxyz023456789]{58}/g, replaceNoteId)
       .replace(HashtagRegex, replaceHashtag);
     ev.Content = content;
   }