diff --git a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm
index fb0e086541..e1b6158721 100644
--- a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm
+++ b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm
@@ -51,7 +51,6 @@ static void resetTrackingArea (NSView* view)
 
     const auto options = NSTrackingMouseEnteredAndExited
                          | NSTrackingMouseMoved
-                         | NSTrackingEnabledDuringMouseDrag
                          | NSTrackingActiveAlways
                          | NSTrackingInVisibleRect;
 
@@ -1777,7 +1776,8 @@ private:
             if (! [[view trackingAreas] containsObject: area])
                 return;
 
-        sendMouseEvent (ev);
+        if ([NSEvent pressedMouseButtons] == 0)
+            sendMouseEvent (ev);
     }
 
     static void setOwner (id viewOrWindow, NSViewComponentPeer* newOwner)