diff --git a/Xi/querydp.c b/Xi/querydp.c
index 310334693..ac11025b3 100644
--- a/Xi/querydp.c
+++ b/Xi/querydp.c
@@ -113,6 +113,7 @@ ProcXQueryDevicePointer(ClientPtr client)
     rep.rootX = pSprite->hot.x;
     rep.rootY = pSprite->hot.y;
     rep.child = None;
+    rep.deviceid = pDev->id;
 
     if (pSprite->hot.pScreen == pWin->drawable.pScreen)
     {