diff --git a/client/command.c b/client/command.c
index bdc0b9f8..c857717d 100644
--- a/client/command.c
+++ b/client/command.c
@@ -509,8 +509,14 @@ void command_process_prompt(char **argv, int argc)
 		return;
 
 	if (!interactive_mode) {
+		if (command_match_misc_commands(argv, argc)) {
+			exit_status = EXIT_SUCCESS;
+			goto quit;
+		}
+
 		display_error("Invalid command\n");
 		exit_status = EXIT_FAILURE;
+quit:
 		l_main_quit();
 		return;
 	}