diff --git a/monitor.c b/monitor.c
index cc1b501cfe..4ba415c8f4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -457,7 +457,10 @@ static void do_info_cpu_stats(Monitor *mon)
 }
 #endif
 
-static void do_quit(Monitor *mon, const QDict *qdict)
+/**
+ * do_quit(): Quit QEMU execution
+ */
+static void do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     exit(0);
 }
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index c37b0cb435..51c76736b7 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -119,7 +119,8 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "quit the emulator",
-        .mhandler.cmd = do_quit,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_quit,
     },
 
 STEXI