diff --git a/Xi/exevents.c b/Xi/exevents.c
index 3f096a6a2..cf73bfd85 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -127,7 +127,8 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
     if (device->isMaster && device->coreEvents && coretype)
         sendCore = TRUE;
 
-    CheckMotion(xE, device);
+    if (device->isMaster)
+        CheckMotion(xE, device);
 
     if (xE->u.u.type != DeviceValuator && xE->u.u.type != GenericEvent) {
         DeviceIntPtr mouse = NULL, kbd = NULL;