diff --git a/src/pages/chat-popout.tsx b/src/pages/chat-popout.tsx
index 0be6676..c806c22 100644
--- a/src/pages/chat-popout.tsx
+++ b/src/pages/chat-popout.tsx
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom";
-import { NostrPrefix, encodeTLV, parseNostrLink } from "@snort/system";
+import { NostrLink, parseNostrLink } from "@snort/system";
 import { unwrap } from "@snort/shared";
 
 import { LiveChat } from "@/element/chat/live-chat";
@@ -13,19 +13,18 @@ export function ChatPopout() {
   const ev = useCurrentStreamFeed(link, true);
   const goal = useZapGoal(findTag(ev, "goal"));
 
-  const lnk = parseNostrLink(encodeTLV(NostrPrefix.Address, findTag(ev, "d") ?? "", undefined, ev?.kind, ev?.pubkey));
   const chat = Boolean(new URL(window.location.href).searchParams.get("chat"));
   return (
     <div className="h-[calc(100vh-1rem)] w-screen px-2 my-2">
-      <LiveChat
+      {ev && <LiveChat
         ev={ev}
-        link={lnk}
+        link={NostrLink.fromEvent(ev)}
         canWrite={chat}
         showScrollbar={false}
         goal={goal}
         className="h-inherit"
         autoRaid={false}
-      />
+      />}
     </div>
   );
 }