diff --git a/core/core-dispatcher.el b/core/core-dispatcher.el
index c086be793..ce980ad42 100644
--- a/core/core-dispatcher.el
+++ b/core/core-dispatcher.el
@@ -739,7 +739,9 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files."
       ;; Assemble el files we want to compile; taking into account that
       ;; MODULES may be a list of MODULE/SUBMODULE strings from the command
       ;; line.
-      (let ((target-files (doom-files-in targets :depth 1 :match "\\.el$")))
+      (let ((target-files (doom-files-in targets :depth 1 :match "\\.el$"))
+            (load-path load-path)
+            kill-emacs-hook kill-buffer-query-functions)
         (unless target-files
           (if targets
               (message "Couldn't find any valid targets")