diff --git a/Xi/exevents.c b/Xi/exevents.c
index 49400e8d4..3f096a6a2 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -124,7 +124,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
     int coretype = 0;
 
     coretype = XItoCoreType(xE->u.u.type);
-    if (device->coreEvents && coretype)
+    if (device->isMaster && device->coreEvents && coretype)
         sendCore = TRUE;
 
     CheckMotion(xE, device);