diff --git a/src/proto_http.c b/src/proto_http.c
index 6990176..5fb510f 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3446,7 +3446,8 @@
 		}
 	}
 
-	if (conn && conn->flags & CO_FL_EARLY_DATA) {
+	if (conn && (conn->flags & CO_FL_EARLY_DATA) &&
+	    (conn->flags & (CO_FL_EARLY_SSL_HS | CO_FL_HANDSHAKE))) {
 		struct hdr_ctx ctx;
 
 		ctx.idx = 0;
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 76f8425..aee3cd9 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -6025,7 +6025,8 @@
 
 	smp->flags = 0;
 	smp->data.type = SMP_T_BOOL;
-	smp->data.u.sint = (conn->flags & CO_FL_EARLY_DATA) ? 1 : 0;
+	smp->data.u.sint = ((conn->flags & CO_FL_EARLY_DATA)  &&
+	    (conn->flags & (CO_FL_EARLY_SSL_HS | CO_FL_HANDSHAKE))) ? 1 : 0;
 
 	return 1;
 }