diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index 2c62ec2db..656f96fbc 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -24,14 +24,7 @@
 
 (use-package! solaire-mode
   :when (or (daemonp) (display-graphic-p))
-  :defer t
-  :init
-  (add-hook! 'doom-load-theme-hook :append
-    (defun +doom-solaire-swap-bg-faces-maybe-h ()
-      (when (string-prefix-p "doom-" (symbol-name doom-theme))
-        (require 'solaire-mode)
-        (solaire-mode-swap-bg)))
-    #'solaire-global-mode)
+  :hook (doom-load-theme . solaire-global-mode)
   :config
   (when (daemonp)
     (add-hook! 'doom-switch-frame-hook
@@ -40,6 +33,12 @@
             (solaire-global-mode +1)
           (solaire-global-mode -1)))))
 
+  (add-hook! 'solaire-global-mode-hook
+    (defun +doom-solaire-swap-bg-faces-maybe-h ()
+      (and solaire-global-mode
+           (string-prefix-p "doom-" (symbol-name doom-theme))
+           (solaire-mode-swap-bg))))
+
   ;; org-capture takes an org buffer and narrows it. The result is erroneously
   ;; considered an unreal buffer, so solaire-mode must be restored.
   (add-hook 'org-capture-mode-hook #'turn-on-solaire-mode)