diff --git a/src/filters.c b/src/filters.c
index 26bed64..69a0331 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -1094,7 +1094,7 @@
 	/* Stop waiting data if the input in closed and no data is pending or if
 	 * the output is closed. */
 	if ((chn->flags & CF_SHUTW) ||
-	    ((chn->flags & CF_SHUTR) && !buffer_pending(chn->buf))) {
+	    ((chn->flags & CF_SHUTR) && !ci_data(chn))) {
 		ret = 1;
 		goto end;
 	}
diff --git a/src/proto_http.c b/src/proto_http.c
index 7f90373..88cb636 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -6158,7 +6158,7 @@
 		if ((s->req.flags & (CF_SHUTR|CF_SHUTW)) == (CF_SHUTR|CF_SHUTW))
 			goto aborted_xfer;
 		/* If we have some pending data, we continue the processing */
-		if (!buffer_pending(res->buf)) {
+		if (!ci_data(res)) {
 			if (!(s->flags & SF_ERR_MASK))
 				s->flags |= SF_ERR_SRVCL;
 			HA_ATOMIC_ADD(&s->be->be_counters.srv_aborts, 1);