diff --git a/packages/app/src/Element/Thread.tsx b/packages/app/src/Element/Thread.tsx
index 62323123..326823ee 100644
--- a/packages/app/src/Element/Thread.tsx
+++ b/packages/app/src/Element/Thread.tsx
@@ -249,7 +249,7 @@ export default function Thread() {
   const root = useMemo(() => {
     const currentNote =
       thread.data?.find(ne => ne.id === currentId) ??
-      ("sig" in location.state ? (location.state as TaggedRawEvent) : undefined);
+      (location.state && "sig" in location.state ? (location.state as TaggedRawEvent) : undefined);
     if (currentNote) {
       const currentThread = EventExt.extractThread(currentNote);
       const isRoot = (ne?: ThreadInfo) => ne === undefined;