diff --git a/core/core.el b/core/core.el
index fbcc2348d..b087e12f6 100644
--- a/core/core.el
+++ b/core/core.el
@@ -146,6 +146,10 @@ ability to invoke the debugger in debug mode."
 ;;;
 ;; Initialize
 (eval-and-compile
+  ;; Defer warnings during the Doom startup process, giving other modules more
+  ;; time to initialize and make mistakes.
+  (remove-hook 'delayed-warnings-hook #'display-delayed-warnings)
+
   (defvar doom--file-name-handler-alist file-name-handler-alist)
   (unless (or after-init-time noninteractive)
     ;; One of the contributors to long startup times is the garbage collector,
@@ -184,6 +188,9 @@ ability to invoke the debugger in debug mode."
       (dolist (hook '(doom-init-hook doom-post-init-hook))
         (run-hook-wrapped hook #'doom-try-run-hook hook)))
 
+    ;; We're ready to display warnings now.
+    (add-hook 'delayed-warnings-hook #'display-delayed-warnings t)
+
     ;; If you forget to reset this, you'll get stuttering and random freezes!
     (setq gc-cons-threshold 16777216
           gc-cons-percentage 0.1
diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el
index f03fb236f..a6365e7f9 100644
--- a/modules/feature/workspaces/config.el
+++ b/modules/feature/workspaces/config.el
@@ -74,10 +74,6 @@ Ensures the scratch (or dashboard) buffers are CDed into the project's root."
       (advice-remove #'doom-buffer-list #'+workspace-buffer-list)))
   (add-hook 'persp-mode-hook #'+workspaces|on-persp-mode)
 
-  ;; Defer delayed warnings even further, so they appear after persp-mode is
-  ;; started and the main workspace is ready to display them. Otherwise, warning
-  ;; buffers will be hidden on startup.
-  (remove-hook 'delayed-warnings-hook #'display-delayed-warnings)
   (defun +workspaces|init (&optional frame)
     (unless persp-mode
       (persp-mode +1)
@@ -95,8 +91,7 @@ Ensures the scratch (or dashboard) buffers are CDed into the project's root."
         ;; Switch to it if we aren't auto-loading the last session
         (when (and (equal (safe-persp-name (get-current-persp)) persp-nil-name)
                    (= persp-auto-resume-time -1))
-          (persp-frame-switch +workspaces-main frame)))
-      (add-hook 'delayed-warnings-hook #'display-delayed-warnings t)))
+          (persp-frame-switch +workspaces-main frame)))))
 
   (defun +workspaces*auto-add-buffer (buffer &rest _)
     "Auto-associate buffers with perspectives upon opening them.