diff --git a/packages/grafana-ui/src/components/uPlot/config/addTooltipSupport.ts b/packages/grafana-ui/src/components/uPlot/config/addTooltipSupport.ts
index d3b50653429..53823ce56c5 100644
--- a/packages/grafana-ui/src/components/uPlot/config/addTooltipSupport.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/addTooltipSupport.ts
@@ -76,11 +76,15 @@ export const addTooltipSupport = ({
   const tooltipInterpolator = config.getTooltipInterpolator();
   if (tooltipInterpolator) {
     config.addHook('setCursor', (u) => {
+      if (isToolTipOpen.current) {
+        return;
+      }
+
       tooltipInterpolator(
         setFocusedSeriesIdx,
         setFocusedPointIdx,
         (clear) => {
-          if (clear && !isToolTipOpen.current) {
+          if (clear) {
             setCoords(null);
             return;
           }
@@ -90,7 +94,7 @@ export const addTooltipSupport = ({
           }
 
           const { x, y } = positionTooltip(u, rect);
-          if (x !== undefined && y !== undefined && !isToolTipOpen.current) {
+          if (x !== undefined && y !== undefined) {
             setCoords({ canvas: { x: u.cursor.left!, y: u.cursor.top! }, viewport: { x, y } });
           }
         },