diff --git a/components/lib/tooltip/Tooltip.js b/components/lib/tooltip/Tooltip.js
index abfd2ed020..654d3d5e3a 100644
--- a/components/lib/tooltip/Tooltip.js
+++ b/components/lib/tooltip/Tooltip.js
@@ -219,11 +219,13 @@ export const Tooltip = React.memo(
                         ZIndexUtils.clear(elementRef.current);
                         DomHandler.removeClass(elementRef.current, 'p-tooltip-active');
 
-                        setVisibleState(false);
                         sendCallback(props.onHide, { originalEvent: e, target: currentTargetRef.current });
                     });
                 }
             }
+
+            // handles the case when visibleState change from mouseenter was queued and mouseleave handler was called earlier than queued re-render
+            setVisibleState(false);
         };
 
         const align = (target, coordinate, position) => {