diff --git a/viewer/src/pages/EventItemSummaryPage.tsx b/viewer/src/pages/EventItemSummaryPage.tsx
index 6c0d808..8e316e9 100644
--- a/viewer/src/pages/EventItemSummaryPage.tsx
+++ b/viewer/src/pages/EventItemSummaryPage.tsx
@@ -16,9 +16,9 @@ export function EventItemSummaryPage() {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
 
-  const event = events.find((e) => e.eventId === eventId);
-
   useEffect(() => {
+    if (!eventId) return;
+    const event = events.find((e) => e.eventId === eventId);
     if (!event) return;
 
     const controller = new AbortController();
@@ -57,9 +57,10 @@ export function EventItemSummaryPage() {
         if (!controller.signal.aborted) setLoading(false);
       });
     return () => controller.abort();
-  }, [event, exclusions]);
+  }, [eventId, events, exclusions]);
 
-  if (!eventId) return null;
+  if (!eventId) return <Navigate to="/" replace />;
+  const event = events.find((e) => e.eventId === eventId);
   if (!event) return <Navigate to="/" replace />;
   if (loading || error) return <LoadingError loading={loading} error={error} />;
 
diff --git a/viewer/src/pages/ReportersPage.tsx b/viewer/src/pages/ReportersPage.tsx
index ed7415c..c390b4f 100644
--- a/viewer/src/pages/ReportersPage.tsx
+++ b/viewer/src/pages/ReportersPage.tsx
@@ -6,7 +6,7 @@ export function ReportersPage() {
   const { eventId } = useParams<{ eventId: string }>();
   const { events, exclusions } = useOutletContext<LayoutContext>();
 
-  if (!eventId) return null;
+  if (!eventId) return <Navigate to="/" replace />;
 
   const event = events.find((e) => e.eventId === eventId);
   if (!event) return <Navigate to="/" replace />;