diff --git a/src/Avalonia.Controls/ToolTipService.cs b/src/Avalonia.Controls/ToolTipService.cs
index 92d2e7cbfe..341ab2fe81 100644
--- a/src/Avalonia.Controls/ToolTipService.cs
+++ b/src/Avalonia.Controls/ToolTipService.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Controls
                 control.PointerLeave += ControlPointerLeave;
             }
 
-            if (e.NewValue != e.OldValue && ToolTip.GetIsOpen(control))
+            if (ToolTip.GetIsOpen(control) && e.NewValue != e.OldValue && !(e.NewValue is ToolTip))
             {
                 var tip = control.GetValue(ToolTip.ToolTipProperty);