diff --git a/dix/dispatch.c b/dix/dispatch.c
index 192c8c34e..e21f08ffe 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3714,9 +3714,7 @@ ProcEstablishConnection(ClientPtr client)
      * So we don't want to send the connection setup info yet, since
      * the auth step isn't really done.
      */
-    if (client->clientState == ClientStateCheckingSecurity)
-	client->clientState = ClientStateCheckedSecurity;
-    else if (client->clientState != ClientStateAuthenticating)
+    if (client->clientState != ClientStateAuthenticating)
 	return(SendConnSetup(client, reason));
     return Success;
 }
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 443e8b0ae..90e617b66 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -60,9 +60,8 @@ typedef enum {ClientStateInitial,
 	      ClientStateAuthenticating,
 	      ClientStateRunning,
 	      ClientStateRetained,
-	      ClientStateGone,
-	      ClientStateCheckingSecurity,
-	      ClientStateCheckedSecurity} ClientState;
+	      ClientStateGone
+} ClientState;
 
 #ifdef XFIXES
 typedef struct _saveSet {