diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 2b77d18b6..d2dabba4f 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -157,7 +157,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     if (!modifiers_failed)
         return BadAlloc;
 
-    if (dev->isMaster)
+    if (IsPointerDevice(dev) && dev->isMaster)
         mod_dev = GetPairedDevice(dev);
     else
         mod_dev = dev;