diff --git a/os/io.c b/os/io.c
index e1b90d17e..c9c173e00 100644
--- a/os/io.c
+++ b/os/io.c
@@ -650,7 +650,8 @@ AbortClient(ClientPtr client)
         _XSERVTransDisconnect(oc->trans_conn);
         _XSERVTransClose(oc->trans_conn);
         oc->trans_conn = NULL;
-        mark_client_ready(client);
+        if (!client->clientGone)
+            mark_client_ready(client);
     }
 }