diff --git a/src/cli.c b/src/cli.c
index 9d210dd..c41a8b5 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1658,7 +1658,7 @@
 	struct buffer *msg = get_trash_chunk();
 	struct channel *oc = si_oc(&s->si[0]);
 
-	if (!s->pcli_prompt)
+	if (!(s->pcli_flags & APPCTX_CLI_ST1_PROMPT))
 		return;
 
 	if (s->pcli_flags & APPCTX_CLI_ST1_PAYLOAD) {
@@ -1790,7 +1790,7 @@
 			*next_pid = target_pid;
 		return 1;
 	} else if (!strcmp("prompt", args[0])) {
-		s->pcli_prompt ^= 1;
+		s->pcli_flags ^= APPCTX_CLI_ST1_PROMPT;
 		return argl; /* return the number of elements in the array */
 
 	} else if (!strcmp("quit", args[0])) {
diff --git a/src/stream.c b/src/stream.c
index 24df70a..d79f86c 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -201,7 +201,6 @@
 
 	s->flags |= SF_INITIALIZED;
 	s->pcli_next_pid = 0;
-	s->pcli_prompt = 0;
 	s->pcli_flags = 0;
 	s->unique_id = NULL;