diff --git a/core/core-packages.el b/core/core-packages.el
index 6dfbfe57c..5bed3ba81 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -80,8 +80,7 @@ missing) and shouldn't be deleted.")
 
 ;; Ensure that, if we do need package.el, it is configured correctly. You really
 ;; shouldn't be using it, but it may be convenient for quick package testing.
-(setq package--init-file-ensured t
-      package-enable-at-startup nil
+(setq package-enable-at-startup nil
       package-user-dir (concat doom-local-dir "elpa/")
       package-gnupghome-dir (expand-file-name "gpg" package-user-dir)
       ;; I omit Marmalade because its packages are manually submitted rather
@@ -92,6 +91,8 @@ missing) and shouldn't be deleted.")
           ("melpa" . ,(concat proto "://melpa.org/packages/"))
           ("org"   . ,(concat proto "://orgmode.org/elpa/")))))
 
+(advice-add #'package--ensure-init-file :override #'ignore)
+
 ;; Don't save `package-selected-packages' to `custom-file'
 (defadvice! doom--package-inhibit-custom-file-a (&optional value)
   :override #'package--save-selected-packages
diff --git a/early-init.el b/early-init.el
index 25005c3ef..cf3138571 100644
--- a/early-init.el
+++ b/early-init.el
@@ -10,6 +10,7 @@
 ;; loaded, but after `early-init-file'. Doom handles package initialization, so
 ;; we must prevent Emacs from doing it early!
 (setq package-enable-at-startup nil)
+(advice-add #'package--ensure-init-file :override #'ignore)
 
 ;; Prevent the glimpse of un-styled Emacs by disabling these UI elements early.
 (push '(menu-bar-lines . 0) default-frame-alist)