diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 499e4f5..027626d 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -2518,6 +2518,7 @@
 
 		case PROMEX_ST_DONE:
 			/* Don't add TLR because mux-h1 will take care of it */
+			res_htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
 			if (!htx_add_endof(res_htx, HTX_BLK_EOM)) {
 				si_rx_room_blk(si);
 				goto out;
diff --git a/src/hlua.c b/src/hlua.c
index 556de42..17de7a0 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -4582,7 +4582,6 @@
 	}
 
 	/* Finalize headers. */
-	htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
 	if (!htx_add_endof(htx, HTX_BLK_EOH)) {
 		hlua_pusherror(L, "Lua applet http '%s': Failed create the response.\n",
 			       appctx->appctx->rule->arg.hlua_rule->fcn.name);
@@ -7122,6 +7121,7 @@
 			goto error;
 
 		/* Don't add TLR because mux-h1 will take care of it */
+		res_htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
 		if (!htx_add_endof(res_htx, HTX_BLK_EOM)) {
 			si_rx_room_blk(si);
 			goto out;