src/contexts/UIStateContext.tsx

@@ -80,13 +80,10 @@ export const UIStateProvider = ({ children }: { children: ReactNode }) => {
 	}, []);
 
 	const setScrollPosition = useCallback((key: string, position: number) => {
-		setScrollPositions((prev) => {
+		setScrollPositions((prev) => ({
-			if (prev[key] === position) return prev;
+			...prev,
-			return {
+			[key]: position,
-				...prev,
+		}));
-				[key]: position,
-			};
-		});
 	}, []);
 
 	const value = useMemo(

src/hooks/useScrollPersistence.ts

@@ -15,6 +15,5 @@ export const useScrollPersistence = (key: string) => {
 		return () => {
 			setScrollPosition(key, window.scrollY);
 		};
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [key, setScrollPosition, scrollPositions]); // eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [key, setScrollPosition]);
 };