diff --git a/src/stream_interface.c b/src/stream_interface.c
index 93772119d..a5bd3edf1 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -655,7 +655,8 @@ static void si_conn_send(struct connection *conn)
 
 		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_SHUTW_NOW))
+		      (oc->flags & CF_EXPECT_MORE))) ||
+		    ((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)