diff --git a/frontend/src/hooks/useCachedData.js b/frontend/src/hooks/useCachedData.js
index 6cf7075..5b03bd6 100644
--- a/frontend/src/hooks/useCachedData.js
+++ b/frontend/src/hooks/useCachedData.js
@@ -36,7 +36,6 @@ export function useCachedData(
   const [source, setSource] = useState('cache');
   const [metadata, setMetadata] = useState(null);
   const cancelledRef = useRef(false);
-  const timeoutIdRef = useRef(null);
 
   const fetchWithTimeout = useCallback(async () => {
     return Promise.race([
@@ -99,11 +98,8 @@ export function useCachedData(
     loadData();
     return () => {
       cancelledRef.current = true;
-      if (timeoutIdRef.current) {
-        clearTimeout(timeoutIdRef.current);
-      }
     };
-  }, [cacheKey, fetchWithTimeout]);
+  }, [loadData]);
 
   return {
     data,
diff --git a/frontend/src/hooks/usePaginatedEvents.js b/frontend/src/hooks/usePaginatedEvents.js
index edcd9b9..5cef511 100644
--- a/frontend/src/hooks/usePaginatedEvents.js
+++ b/frontend/src/hooks/usePaginatedEvents.js
@@ -90,7 +90,7 @@ export function usePaginatedEvents() {
     return () => {
       cancelledRef.current = true;
     };
-  }, []);
+  }, [loadPage]);
 
   const cursor = createCursorFromPosition(events, Math.min(PAGE_SIZE - 1, events.length - 1));