diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c
index 79ef22b87d..1c9437b397 100644
--- a/src/imap/cmd-list.c
+++ b/src/imap/cmd-list.c
@@ -252,6 +252,8 @@ static bool cmd_list_continue(struct client_command_context *cmd)
 
 		/* send LIST/LSUB response */
 		ret = client_send_line_next(ctx->cmd->client, str_c(str));
+		if (ret < 0)
+			return TRUE;
 
 		/* send STATUS response */
 		if (ctx->used_status) {