diff --git a/core/autoload/modules.el b/core/autoload/modules.el
index 78c271429..a3a478475 100644
--- a/core/autoload/modules.el
+++ b/core/autoload/modules.el
@@ -197,11 +197,7 @@ This should be run whenever your `doom!' block or update your packages."
   (interactive)
   (if (and (not force-p)
            (file-exists-p doom-package-autoload-file)
-           (not (cl-loop initially do (doom-ensure-packages-initialized t)
-                         for (_pkg desc) in package-alist
-                         for autoload-file = (concat (package--autoloads-file-name desc) ".el")
-                         if (file-newer-than-file-p autoload-file doom-package-autoload-file)
-                         return t)))
+           (not (file-newer-than-file-p package-user-dir doom-package-autoload-file)))
       (ignore (print! (green "Doom package autoloads is up-to-date"))
               (doom-initialize-autoloads doom-package-autoload-file))
     (doom-delete-autoloads-file doom-package-autoload-file)
@@ -210,7 +206,7 @@ This should be run whenever your `doom!' block or update your packages."
               ";; This file is autogenerated by `doom//reload-package-autoloads', DO NOT EDIT !!\n\n")
       (save-excursion
         ;; Cache the important and expensive-to-initialize state here.
-        (doom-initialize-packages 'internal)
+        (doom-initialize-packages)
         (prin1 `(setq load-path ',load-path
                       auto-mode-alist ',auto-mode-alist
                       Info-directory-list ',Info-directory-list