diff --git a/web/src/widgets/ConsolidatedOsv/CounterPairsView.tsx b/web/src/widgets/ConsolidatedOsv/CounterPairsView.tsx
index e61b328..c2bc981 100644
--- a/web/src/widgets/ConsolidatedOsv/CounterPairsView.tsx
+++ b/web/src/widgets/ConsolidatedOsv/CounterPairsView.tsx
@@ -55,6 +55,11 @@ function usePagedRows(versionId: string, filters: OsvFilters | null, reloadKey:
 		getConsolidatedOsv(versionId, filters, OSV_PAGE_SIZE, (page - 1) * OSV_PAGE_SIZE)
 			.then((r) => {
 				if (requestId !== requestRef.current) return;
+				// страница ушла за конец (последнюю строку сопоставили) — назад на допустимую
+				if (r.items.length === 0 && page > 1) {
+					setPage(page - 1);
+					return;
+				}
 				setRows(r.items);
 				setTotal(r.total);
 				setError(null);
@@ -89,6 +94,7 @@ export function CounterPairsView({ versionId, pairs, selected, numFormat, onSele
 	useEffect(() => {
 		setQ('');
 		setDebouncedQ('');
+		setMapping(null);
 	}, [selectedKey]);
 
 	const centerFilters: OsvFilters | null = selected ? { legal_entity_id: selected.holder_id, counterparty_id: selected.missing_id } : null;
@@ -128,6 +134,7 @@ export function CounterPairsView({ versionId, pairs, selected, numFormat, onSele
 	];
 
 	const mapped = useCallback(() => {
+		setMapping(null);
 		setReloadKey((k) => k + 1);
 		onMapped();
 	}, [onMapped]);
diff --git a/web/src/widgets/ConsolidatedOsvContent/ConsolidatedOsvContent.tsx b/web/src/widgets/ConsolidatedOsvContent/ConsolidatedOsvContent.tsx
index 9888527..4550630 100644
--- a/web/src/widgets/ConsolidatedOsvContent/ConsolidatedOsvContent.tsx
+++ b/web/src/widgets/ConsolidatedOsvContent/ConsolidatedOsvContent.tsx
@@ -62,7 +62,9 @@ export function OsvContent({ card, onSummaryChange }: Props) {
 		if (selectedPair && (selectedPair.holder_id !== pairsView.holder || selectedPair.missing_id !== pairsView.missing)) {
 			setView({ view: 'pairs', holder: selectedPair.holder_id, missing: selectedPair.missing_id });
 		}
-	});
+		// biome-ignore lint/correctness/useExhaustiveDependencies: setView пересоздаётся каждый рендер, нужны только эти значения
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [inPairs, s, selectedPair, pairsView.holder, pairsView.missing]);
 	useEffect(() => {
 		onSummaryChange?.(s);
 	}, [s, onSummaryChange]);