diff --git a/dix/devices.c b/dix/devices.c
index 411188d8f2..30c2670940 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -556,7 +556,10 @@ CloseDevice(DeviceIntPtr dev)
     for (j = 0; j < currentMaxClients; j++)
     {
         if (clients[j]->clientPtr == dev)
-            PickPointer(clients[j]);
+        {
+            clients[j]->clientPtr = NULL;
+            clients[j]->clientPtr = PickPointer(clients[j]);
+        }
     }
 
     if (dev->devPrivates)