diff --git a/src/mux_h1.c b/src/mux_h1.c
index 6f7b0fb..e01f600 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -270,6 +270,9 @@
 	if (h1s->flags & H1S_F_NOT_FIRST)
 		cs->flags |= CS_FL_NOT_FIRST;
 
+	if (global.tune.options & GTUNE_USE_SPLICE)
+		cs->flags |= CS_FL_MAY_SPLICE;
+
 	if (stream_create_from_cs(cs) < 0)
 		goto err;
 	return cs;
@@ -1379,6 +1382,12 @@
 		h1_capture_bad_message(h1s->h1c, h1s, h1m, buf);
 		return 0;
 	}
+
+	if (h1m->state == H1_MSG_DATA && h1m->curr_len && h1s->cs)
+		h1s->cs->flags |= CS_FL_MAY_SPLICE;
+	else if (h1s->cs)
+		h1s->cs->flags &= ~CS_FL_MAY_SPLICE;
+
 	/* update htx->extra, only when the body length is known */
 	if (h1m->flags & H1_MF_XFER_LEN)
 		htx->extra = h1m->curr_len;
@@ -2547,6 +2556,10 @@
 		h1s->flags |= H1S_F_REOS;
 		h1s->flags &= ~(H1S_F_BUF_FLUSH|H1S_F_SPLICED_DATA);
 	}
+
+	if (h1m->state != H1_MSG_DATA || !h1m->curr_len)
+		cs->flags &= ~CS_FL_MAY_SPLICE;
+
 	return ret;
 }