diff --git a/modules/ui/doom-quit/config.el b/modules/ui/doom-quit/config.el
index d1dc8d899..8e9bc50fe 100644
--- a/modules/ui/doom-quit/config.el
+++ b/modules/ui/doom-quit/config.el
@@ -26,13 +26,12 @@
   "A list of quit messages, picked randomly by `+doom-quit'. Taken from
 http://doom.wikia.com/wiki/Quit_messages and elsewhere.")
 
-(defun +doom-quit (&rest _)
-  (if (doom-real-buffers-list)
-      (y-or-n-p
-       (format "%s  Quit?"
-               (nth (random (length +doom-quit-messages))
-                    +doom-quit-messages)))
-    t))
-
-(setq confirm-kill-emacs #'+doom-quit)
+(defun +doom|quit (&rest _)
+  (doom-quit-p
+   (format "%s  Quit?"
+           (nth (random (length +doom-quit-messages))
+                +doom-quit-messages))))
 
+;;
+(remove-hook 'kill-emacs-query-functions #'doom-quit-p)
+(add-hook 'kill-emacs-query-functions #'+doom|quit)