diff --git a/core/autoload/config.el b/core/autoload/config.el
index 8ad4a1066..9439bc96c 100644
--- a/core/autoload/config.el
+++ b/core/autoload/config.el
@@ -39,24 +39,15 @@ Runs `doom-reload-hook' afterwards."
                "Reload anyway?"))
       (user-error "Aborted"))
   (require 'core-cli)
-  (require 'core-packages)
-  (doom-delete-autoloads-file doom-autoload-file)
-  (doom-delete-autoloads-file doom-package-autoload-file)
-  (let ((doom-reloading-p t)
-        doom-init-p
-        doom-init-modules-p
-        doom-init-packages-p)
-    (let ((default-directory doom-core-dir))
-      (mapc (doom-rpartial #'load 'noerror 'nomessage)
-            (file-expand-wildcards "autoload/*.el")))
+  (let ((doom-reloading-p t))
+    (compile (format "%s/bin/doom refresh -f" doom-emacs-dir))
+    (while compilation-in-progress
+      (sit-for 1))
     (doom-initialize 'force)
-    (when (file-exists-p doom-env-file)
-      (doom-reload-env-file))
-    (doom-reload-autoloads nil 'force)
     (with-demoted-errors "PRIVATE CONFIG ERROR: %s"
       (general-auto-unbind-keys)
       (unwind-protect
-          (doom-initialize-modules)
+          (doom-initialize-modules 'force)
         (general-auto-unbind-keys t)))
     (run-hook-wrapped 'doom-reload-hook #'doom-try-run-hook))
   (message "Finished!"))
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index ad88a46ae..2115ec2b7 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -849,7 +849,8 @@ compelling reason, so..."
              #'+org-init-smartparens-h)
 
   ;; In case the user has eagerly loaded org from their configs
-  (when (featurep 'org)
+  (when (and (featurep 'org)
+             (not doom-reloading-p))
     (message "`org' was already loaded by the time lang/org loaded, this may cause issues")
     (run-hooks 'org-load-hook))