diff --git a/src/cli.c b/src/cli.c
index fcb995a01..059e343d7 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -3902,12 +3902,17 @@ error:
 	return -1;
 }
 
+size_t cli_raw_rcv_buf(struct appctx *appctx, struct buffer *buf, size_t count, unsigned int flags)
+{
+	return b_xfer(buf, &appctx->outbuf, MIN(count, b_data(&appctx->outbuf)));
+}
+
 static struct applet cli_applet = {
 	.obj_type = OBJ_TYPE_APPLET,
 	.flags = APPLET_FL_NEW_API,
 	.name = "<CLI>", /* used for logging */
 	.fct = cli_io_handler,
-	.rcv_buf = appctx_raw_rcv_buf,
+	.rcv_buf = cli_raw_rcv_buf,
 	.snd_buf = appctx_raw_snd_buf,
 	.release = cli_release_handler,
 };
@@ -3918,7 +3923,7 @@ static struct applet mcli_applet = {
 	.flags = APPLET_FL_NEW_API,
 	.name = "<MCLI>", /* used for logging */
 	.fct = cli_io_handler,
-	.rcv_buf = appctx_raw_rcv_buf,
+	.rcv_buf = cli_raw_rcv_buf,
 	.snd_buf = appctx_raw_snd_buf,
 	.release = cli_release_handler,
 };