diff --git a/src/stream_interface.c b/src/stream_interface.c
index 2c48b031b..9eef3a2f0 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -673,7 +673,8 @@ static void si_cs_send(struct conn_stream *cs)
 		if ((!(oc->flags & (CF_NEVER_WAIT|CF_SEND_DONTWAIT)) &&
 		     ((oc->to_forward && oc->to_forward != CHN_INFINITE_FORWARD) ||
 		      (oc->flags & CF_EXPECT_MORE))) ||
-		    ((oc->flags & (CF_AUTO_CLOSE|CF_SHUTW_NOW)) == (CF_AUTO_CLOSE|CF_SHUTW_NOW)))
+		    ((oc->flags & CF_ISRESP) &&
+		     ((oc->flags & (CF_AUTO_CLOSE|CF_SHUTW_NOW)) == (CF_AUTO_CLOSE|CF_SHUTW_NOW))))
 			send_flag |= CO_SFL_MSG_MORE;
 
 		if (oc->flags & CF_STREAMER)