diff --git a/Makefile b/Makefile
index c9eee0604..a53dc66e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Ensure emacs always runs from this makefile's PWD
 EMACS_FLAGS=--eval '(setq user-emacs-directory default-directory)' -l core/core.el
-EMACS=emacs --batch $(EMACS_FLAGS)
+EMACS=emacs --quick --batch $(EMACS_FLAGS)
 EMACSI=emacs -q $(EMACS_FLAGS)
 
 MODULES=$(patsubst modules/%, %, $(shell find modules/ -maxdepth 2 -type d))
diff --git a/bin/doom-doctor b/bin/doom-doctor
index 311cb3e21..0578e1a23 100755
--- a/bin/doom-doctor
+++ b/bin/doom-doctor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 ":"; command -v emacs >/dev/null || { >&2 echo "Emacs isn't installed"; exit 1; } # -*-emacs-lisp-*-
-":"; [[ $(emacs --version | head -n1) == *\ 2[0-2].[0-1].[0-9] ]] && { echo "You're running $(emacs --version | head -n1)"; echo "That version is too old to run the doctor. Check your PATH"; echo; exit 2; } || exec emacs --no-site-file --batch -l "$0"
+":"; [[ $(emacs --version | head -n1) == *\ 2[0-2].[0-1].[0-9] ]] && { echo "You're running $(emacs --version | head -n1)"; echo "That version is too old to run the doctor. Check your PATH"; echo; exit 2; } || exec emacs --quick --script "$0"
 
 ;; Uses a couple simple heuristics to locate issues with your environment that
 ;; could interfere with running or setting up DOOM Emacs.
diff --git a/core/core-packages.el b/core/core-packages.el
index 3ed47b0b3..d5fccd9cc 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -603,7 +603,7 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files."
     (if (not noninteractive)
         (let ((compilation-filter-hook
                (list (lambda () (ansi-color-apply-on-region compilation-filter-start (point))))))
-          (compile (format "%s --batch -l core/core.el -f doom//byte-compile %s %s"
+          (compile (format "%s --quick --batch -l core/core.el -f doom//byte-compile %s %s"
                            (executable-find "emacs")
                            (if recompile-p "-r" "")
                            (if modules (string-join modules " ") ""))))