diff --git a/src/proto_htx.c b/src/proto_htx.c
index af73a50..979217b 100644
--- a/src/proto_htx.c
+++ b/src/proto_htx.c
@@ -524,7 +524,7 @@
 	}
 
 	if (conn && (conn->flags & CO_FL_EARLY_DATA) &&
-	    (conn->flags & (CO_FL_EARLY_SSL_HS | CO_FL_HANDSHAKE))) {
+	    (conn->flags & (CO_FL_EARLY_SSL_HS | CO_FL_SSL_WAIT_HS))) {
 		struct http_hdr_ctx ctx;
 
 		ctx.blk = NULL;
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 1fa1092..b28c9cd 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -6667,7 +6667,7 @@
 	}
 #else
 	smp->data.u.sint = ((conn->flags & CO_FL_EARLY_DATA)  &&
-	    (conn->flags & (CO_FL_EARLY_SSL_HS | CO_FL_HANDSHAKE))) ? 1 : 0;
+	    (conn->flags & (CO_FL_EARLY_SSL_HS | CO_FL_SSL_WAIT_HS))) ? 1 : 0;
 #endif
 	return 1;
 }