diff --git a/src/cli.c b/src/cli.c
index f76a91dcf..875b68c10 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1086,17 +1086,18 @@ int cli_parse_cmdline(struct appctx *appctx)
  */
 void cli_io_handler(struct appctx *appctx)
 {
-	if (applet_fl_test(appctx, APPCTX_FL_OUTBLK_ALLOC|APPCTX_FL_OUTBLK_FULL) ||
-	    !appctx_get_buf(appctx, &appctx->outbuf)) {
-                applet_wont_consume(appctx);
-		goto out;
-	}
 
 	if (unlikely(applet_fl_test(appctx, APPCTX_FL_EOS|APPCTX_FL_ERROR))) {
 		appctx->st0 = CLI_ST_END;
 		goto out;
 	}
 
+	if (applet_fl_test(appctx, APPCTX_FL_OUTBLK_ALLOC|APPCTX_FL_OUTBLK_FULL) ||
+	    !appctx_get_buf(appctx, &appctx->outbuf)) {
+                applet_wont_consume(appctx);
+		goto out;
+	}
+
 	while (1) {
 		if (appctx->st0 == CLI_ST_INIT) {
 			/* reset severity to default at init */