diff --git a/Xi/exevents.c b/Xi/exevents.c
index 00a6b2151..a976802a2 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -150,7 +150,7 @@ XIGetDevice(xEvent* xE)
         int rc;
         int id;
 
-        id = ((deviceKeyButtonPointer*)xE)->deviceid;
+        id = ((deviceKeyButtonPointer*)xE)->deviceid & ~MORE_EVENTS;
 
         rc = dixLookupDevice(&pDev, id, serverClient, DixUnknownAccess);
         if (rc != Success)