diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index a02ed212d..0d3bc6490 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -41,12 +41,13 @@
 
 
 (def-package! solaire-mode
-  :after doom-themes
+  :defer t
   :init
   (add-hook 'doom-load-theme-hook
     (defun +doom-solaire-mode-swap-bg-maybe-h ()
-      (when-let (rule (cdr (assq doom-theme +doom-solaire-themes)))
-        (solaire-mode-swap-bg)))
+      (pcase-let ((`(,theme . ,swap) (assq doom-theme +doom-solaire-themes)))
+        (require 'solaire-mode)
+        (if swap (solaire-mode-swap-bg))))
     'append)
   :config
   ;; fringe can become unstyled when deleting or focusing frames