diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index 5ae5ddacd..17b7e70cc 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -33,6 +33,13 @@
         (solaire-mode-swap-bg)))
     #'solaire-global-mode)
   :config
+  (when (daemonp)
+    (add-hook! 'doom-switch-frame-hook
+      (defun +doom-disable-solaire-mode-maybe-h (frame)
+        (if (display-graphic-p frame)
+            (solaire-global-mode +1)
+          (solaire-global-mode -1)))))
+
   ;; 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)