diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 59bfe0f33..42f207808 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -674,6 +674,7 @@ ProcXGetDeviceProperty (ClientPtr client)
     reply.repType = X_Reply;
     reply.RepType = X_GetDeviceProperty;
     reply.sequenceNumber = client->sequence;
+    reply.deviceid = dev->id;
     if (!prop)
     {
         reply.nItems = 0;