diff --git a/Xi/exevents.c b/Xi/exevents.c
index 2ae5a62eb..7afb69e24 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -699,6 +699,7 @@ ChangeMasterDeviceClasses(DeviceIntPtr device, DeviceChangedEvent *dce)
 
     /* FIXME: the classes may have changed since we generated the event. */
     DeepCopyDeviceClasses(slave, device, dce);
+    dce->deviceid = device->id;
     XISendDeviceChangedEvent(device, dce);
 }