diff --git a/src/h2.c b/src/h2.c
index 3ff4b4d..a4279d3 100644
--- a/src/h2.c
+++ b/src/h2.c
@@ -294,6 +294,8 @@
 		goto fail;
 
 	sl->info.req.meth = find_http_meth(phdr[H2_PHDR_IDX_METH].ptr, phdr[H2_PHDR_IDX_METH].len);
+	if (sl->info.req.meth == HTTP_METH_HEAD)
+		*msgf |= H2_MSGF_BODYLESS_RSP;
 	return sl;
  fail:
 	return NULL;
@@ -547,6 +549,8 @@
 	 * On 1xx responses there is no ES on the HEADERS frame but there is no
 	 * body. So remove the flag H2_MSGF_BODY and add H2_MSGF_RSP_1XX to
 	 * notify the decoder another HEADERS frame is expected.
+	 * 204/304 resposne have no body by definition. So remove the flag
+	 * H2_MSGF_BODY and set H2_MSGF_BODYLESS_RSP.
 	 */
 	if (status == 101)
 		goto fail;
@@ -554,6 +558,10 @@
 		*msgf |= H2_MSGF_RSP_1XX;
 		*msgf &= ~H2_MSGF_BODY;
 	}
+	else if (sl->info.res.status == 204 || sl->info.res.status == 304) {
+		*msgf &= ~H2_MSGF_BODY;
+		*msgf |= H2_MSGF_BODYLESS_RSP;
+	}
 
 	/* Set HTX start-line flags */
 	flags |= HTX_SL_F_VER_11;    // V2 in fact