diff --git a/src/h2.c b/src/h2.c
index a50c15c..2d9410d 100644
--- a/src/h2.c
+++ b/src/h2.c
@@ -445,6 +445,9 @@
 			goto fail;
 	}
 
+	if (*msgf & H2_MSGF_BODY_TUNNEL)
+		*msgf &= ~(H2_MSGF_BODY|H2_MSGF_BODY_CL);
+
 	if (!(*msgf & H2_MSGF_BODY) || ((*msgf & H2_MSGF_BODY_CL) && *body_len == 0))
 		sl_flags |= HTX_SL_F_BODYLESS;
 
@@ -682,6 +685,11 @@
 			goto fail;
 	}
 
+	if ((*msgf & H2_MSGF_BODY_TUNNEL) && sl->info.res.status >= 200 && sl->info.res.status < 300)
+		*msgf &= ~(H2_MSGF_BODY|H2_MSGF_BODY_CL);
+	else
+		*msgf &= ~H2_MSGF_BODY_TUNNEL;
+
 	if (!(*msgf & H2_MSGF_BODY) || ((*msgf & H2_MSGF_BODY_CL) && *body_len == 0))
 		sl_flags |= HTX_SL_F_BODYLESS;