diff --git a/src/http_client.c b/src/http_client.c
index 39d7aa2ac..fec35c1b6 100644
--- a/src/http_client.c
+++ b/src/http_client.c
@@ -928,7 +928,8 @@ more:
 	 * isn't any data to handle and a shutdown is detected, let's stop
 	 * everything */
 	if ((req->flags & (CF_SHUTR|CF_SHUTR_NOW)) ||
-	    (res->flags & (CF_SHUTW|CF_SHUTW_NOW))) {
+	    (res->flags & CF_SHUTW) ||
+	    ((res->flags & CF_SHUTW_NOW) && channel_is_empty(res))) {
 		goto end;
 	}
 	return;