diff --git a/src/proto_http.c b/src/proto_http.c
index d737cfe54..865eaa494 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -4248,7 +4248,9 @@ int http_request_forward_body(struct session *s, struct buffer *req, int an_bit)
 		else {
 			/* other states, DONE...TUNNEL */
 			/* for keep-alive we don't want to forward closes on DONE */
-			buffer_dont_close(req);
+			if ((txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_KAL ||
+			    (txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_SCL)
+				buffer_dont_close(req);
 			if (http_resync_states(s)) {
 				/* some state changes occurred, maybe the analyser
 				 * was disabled too.
@@ -4292,6 +4294,12 @@ int http_request_forward_body(struct session *s, struct buffer *req, int an_bit)
 		goto return_bad_req;
 	}
 
+	/* When TE: chunked is used, we need to get there again to parse remaining
+	 * chunks even if the client has closed, so we don't want to set BF_DONTCLOSE.
+	 */
+	if (txn->flags & TX_REQ_TE_CHNK)
+		buffer_dont_close(req);
+
 	http_silent_debug(__LINE__, s);
 	return 0;
 
@@ -5172,7 +5180,9 @@ int http_response_forward_body(struct session *s, struct buffer *res, int an_bit
 		else {
 			/* other states, DONE...TUNNEL */
 			/* for keep-alive we don't want to forward closes on DONE */
-			buffer_dont_close(res);
+			if ((txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_KAL ||
+			    (txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_SCL)
+				buffer_dont_close(res);
 			if (http_resync_states(s)) {
 				http_silent_debug(__LINE__, s);
 				/* some state changes occurred, maybe the analyser
@@ -5208,6 +5218,16 @@ int http_response_forward_body(struct session *s, struct buffer *res, int an_bit
 		msg->som = msg->sov;
 	}
 
+	/* When TE: chunked is used, we need to get there again to parse remaining
+	 * chunks even if the server has closed, so we don't want to set BF_DONTCLOSE.
+	 * Similarly, with keep-alive on the client side, we don't want to forward a
+	 * close.
+	 */
+	if ((txn->flags & TX_RES_TE_CHNK) ||
+	    (txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_KAL ||
+	    (txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_SCL)
+		buffer_dont_close(res);
+
 	/* the session handler will take care of timeouts and errors */
 	http_silent_debug(__LINE__, s);
 	return 0;