diff --git a/Xi/exevents.c b/Xi/exevents.c
index 6a1f1bb15..5ab9d660f 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1040,7 +1040,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
     b = device->button;
     k = device->key;
 
-    if (device->isMaster)
+    if (device->isMaster || !device->u.master)
         CheckMotion(xE, device);
 
     if (xE->u.u.type != DeviceValuator && xE->u.u.type != GenericEvent) {