diff --git a/apps/client/src/common/hooks-query/useContextRundown.ts b/apps/client/src/common/hooks-query/useContextRundown.ts
index 142eb0b30..0dfb3b69d 100644
--- a/apps/client/src/common/hooks-query/useContextRundown.ts
+++ b/apps/client/src/common/hooks-query/useContextRundown.ts
@@ -3,7 +3,7 @@ import { useMemo } from 'react';
 import { useRundownSelectionContext } from '../context/RundownSelectionContext';
 import { useSelectedEventId } from '../hooks/useSocket';
 import { getFlatRundownMetadata, getRundownMetadata } from '../utils/rundownMetadata';
-import { useRundown } from './useRundown';
+import { useFlatRundown, useRundown } from './useRundown';
 
 export function useContextRundownEditModal() {
   'use memo';
@@ -62,3 +62,18 @@ export function useContextRundownTable() {
     [flatRundown, status, loadedEventId],
   );
 }
+
+export function useContextRundownFinder() {
+  'use memo';
+  const { effectiveRundownId } = useRundownSelectionContext();
+  const { data: rundown, status } = useFlatRundown(effectiveRundownId);
+
+  return useMemo(
+    () => ({
+      rundown,
+      rundownId: effectiveRundownId,
+      status,
+    }),
+    [rundown, status, effectiveRundownId],
+  );
+}
diff --git a/apps/client/src/views/editor/finder/useFinder.tsx b/apps/client/src/views/editor/finder/useFinder.tsx
index fdfda8a2f..47c0e803b 100644
--- a/apps/client/src/views/editor/finder/useFinder.tsx
+++ b/apps/client/src/views/editor/finder/useFinder.tsx
@@ -1,7 +1,7 @@
 import { EntryId, MaybeString, SupportedEntry, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
 import { ChangeEvent, useCallback, useEffect, useRef, useState } from 'react';
 
-import { useFlatRundown } from '../../../common/hooks-query/useRundown';
+import { useContextRundownFinder } from '../../../common/hooks-query/useContextRundown';
 import { useSelectAndRevealEntry } from '../../../features/rundown/useSelectAndRevealEntry';
 
 const maxResults = 12;
@@ -38,7 +38,7 @@ type FilterableMilestone = {
 type FilterableEntry = FilterableGroup | FilterableEvent | FilterableMilestone;
 
 export default function useFinder() {
-  const { data, rundownId } = useFlatRundown();
+  const { rundown: data, rundownId } = useContextRundownFinder();
   const [results, setResults] = useState<FilterableEntry[]>([]);
   const [error, setError] = useState<MaybeString>(null);
   const lastSearchString = useRef('');