diff --git a/dix/events.c b/dix/events.c
index 73b7fa0f2..cec12f0b2 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5410,7 +5410,6 @@ ProcQueryPointer(ClientPtr client)
     xQueryPointerReply rep;
     WindowPtr pWin, t;
     DeviceIntPtr mouse = PickPointer(client);
-    DeviceIntPtr dev;
     SpritePtr pSprite;
     int rc;
     REQUEST(xResourceReq);
@@ -5423,18 +5422,6 @@ ProcQueryPointer(ClientPtr client)
     if (rc != Success)
 	return rc;
 
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-        if (dev->isMaster && IsPointerDevice(dev) &&
-                dev->deviceGrab.grab && dev->deviceGrab.grab->coreGrab &&
-                SameClient(dev->deviceGrab.grab, client))
-        {
-            /* special case, we have a grab on the device so we need to return
-             * this one */
-            mouse = dev;
-        }
-    }
-
     pSprite = mouse->spriteInfo->sprite;
     if (mouse->valuator->motionHintWindow)
 	MaybeStopHint(mouse, client);
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index d415fe75f..e00791c18 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -295,6 +295,8 @@ miPointerSpriteFuncRec EphyrPointerSpriteFuncs = {
 	ephyrUnrealizeCursor,
 	ephyrSetCursor,
 	ephyrMoveCursor,
+        NULL,
+        NULL
 };