diff --git a/lib/client.c b/lib/client.c
index 35fe8a19..fd7bb186 100644
--- a/lib/client.c
+++ b/lib/client.c
@@ -868,7 +868,9 @@ bail3:
 	close_reason = LWS_CLOSE_STATUS_NOSTATUS;
 
 bail2:
-	if (wsi->protocol && wsi->state == LWSS_ESTABLISHED) {
+	if (wsi->protocol &&
+	    (wsi->state == LWSS_ESTABLISHED ||
+	     wsi->state == LWSS_CLIENT_UNCONNECTED)) {
 		if (isErrorCodeReceived && p) {
 			wsi->protocol->callback(wsi,
 				LWS_CALLBACK_CLIENT_CONNECTION_ERROR,