diff --git a/src/Avalonia.Base/Input/Pointer.cs b/src/Avalonia.Base/Input/Pointer.cs
index 8e305a66ad..43692da296 100644
--- a/src/Avalonia.Base/Input/Pointer.cs
+++ b/src/Avalonia.Base/Input/Pointer.cs
@@ -88,7 +88,10 @@ namespace Avalonia.Input
 
         public void Dispose()
         {
-            Capture(null);
+            if (Captured != null)
+            {
+                Capture(null);
+            }
         }
 
         /// <summary>