diff --git a/Xi/listdev.c b/Xi/listdev.c
index 1c847fb..cbc5a0c 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -315,8 +315,10 @@ ListDeviceInfo(ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev,
 static Bool
 ShouldSkipDevice(ClientPtr client, DeviceIntPtr d)
 {
-    /* don't send master devices other than VCP/VCK */
-    if (!IsMaster(d) || d == inputInfo.pointer || d == inputInfo.keyboard)
+    /* don't send master devices other than VCP/VCK, only
+       send floating slave devices. */
+    if (!IsMaster(d) || d == inputInfo.pointer || d == inputInfo.keyboard ||
+        GetMaster(d, MASTER_POINTER) == NULL)
     {
         int rc = XaceHook(XACE_DEVICE_ACCESS, client, d, DixGetAttrAccess);
         if (rc == Success)