diff --git a/dix/dispatch.c b/dix/dispatch.c
index c93703efbc..cb7e87acc9 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1203,6 +1203,7 @@ UngrabServer(ClientPtr client)
     int i;
 
     grabState = GrabNone;
+    grabClient = NULL;
     ListenToAllClients();
     mark_client_ungrab();
     for (i = mskcnt; --i >= 0 && !grabWaiters[i];);