diff --git a/core/core-modules.el b/core/core-modules.el
index 5c8c606ad..54971f34d 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -76,6 +76,7 @@ non-nil."
   (when (or force-p (not doom-init-modules-p))
     (setq doom-init-modules-p t
           doom-modules nil)
+    (load custom-file 'noerror 'nomessage)
     (when (load! "init" doom-private-dir t)
       (when doom-modules
         (maphash (lambda (key plist)
diff --git a/core/core.el b/core/core.el
index 226ce8e6d..8a39f30bf 100644
--- a/core/core.el
+++ b/core/core.el
@@ -201,7 +201,7 @@ users).")
 (setq abbrev-file-name             (concat doom-local-dir "abbrev.el")
       async-byte-compile-log-file  (concat doom-etc-dir "async-bytecomp.log")
       bookmark-default-file        (concat doom-etc-dir "bookmarks")
-      custom-file                  (concat doom-private-dir "init.el")
+      custom-file                  (concat doom-local-dir "custom.el")
       custom-theme-directory       (concat doom-private-dir "themes/")
       desktop-dirname              (concat doom-etc-dir "desktop")
       desktop-base-file-name       "autosave"