diff --git a/src/components/QueryResultTable/Cell/Cell.tsx b/src/components/QueryResultTable/Cell/Cell.tsx
index 41b98dadc7..2df43422b2 100644
--- a/src/components/QueryResultTable/Cell/Cell.tsx
+++ b/src/components/QueryResultTable/Cell/Cell.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {hideTooltip, showTooltip} from '../../../store/reducers/tooltip';
+import {showTooltip} from '../../../store/reducers/tooltip';
 import {useTypedDispatch} from '../../../utils/hooks';
 import {b} from '../QueryResultTable';
 
@@ -14,13 +14,6 @@ export const Cell = React.memo(function Cell(props: CellProps) {
 
     const dispatch = useTypedDispatch();
 
-    React.useEffect(
-        () => () => {
-            dispatch(hideTooltip());
-        },
-        [dispatch],
-    );
-
     return (
         <span
             className={b('cell', className)}
diff --git a/src/containers/ReduxTooltip/ReduxTooltip.js b/src/containers/ReduxTooltip/ReduxTooltip.js
index 3de5abca60..b40f1b1f71 100644
--- a/src/containers/ReduxTooltip/ReduxTooltip.js
+++ b/src/containers/ReduxTooltip/ReduxTooltip.js
@@ -23,19 +23,19 @@ function ReduxTooltip(props) {
         rect: {top: props.positions?.top, left: props.positions?.left},
     });
 
+    const handleScroll = React.useCallback(() => {
+        const {hideTooltip, toolTipVisible} = props;
+        if (toolTipVisible) {
+            setTimeout(() => hideTooltip(), 500);
+        }
+    }, [props]);
+
     React.useEffect(() => {
         window.addEventListener('scroll', handleScroll, true);
         return () => {
             window.removeEventListener('scroll', handleScroll);
         };
-    }, []);
-
-    const handleScroll = () => {
-        const {hideTooltip, toolTipVisible} = props;
-        if (toolTipVisible) {
-            setTimeout(() => hideTooltip(), 500);
-        }
-    };
+    }, [handleScroll]);
 
     const renderPositionPopup = (visible, positions, data, additionalData) => {
         const {template, popupClassName, hideTooltip} = props;