diff --git a/modules/ui/indent-guides/config.el b/modules/ui/indent-guides/config.el
index 3beed5067..e6b1cdf0e 100644
--- a/modules/ui/indent-guides/config.el
+++ b/modules/ui/indent-guides/config.el
@@ -5,7 +5,7 @@
   :init
   (setq highlight-indent-guides-method 'character)
   :config
-  (defun +indent-guides-init-faces-h ()
+  (defun +indent-guides-init-faces-h (&rest _)
     (when (display-graphic-p)
       (highlight-indent-guides-auto-set-faces)))
 
@@ -13,10 +13,9 @@
   ;;      but is unable to do so properly in terminal Emacs, where it only has
   ;;      access to 256 colors. So if the user uses a daemon we must wait for
   ;;      the first graphical frame to be available to do.
-  (add-hook (if (daemonp)
-                'server-after-make-frame-hook
-              'doom-load-theme-hook)
-            #'+indent-guides-init-faces-h)
+  (add-hook 'doom-load-theme-hook #'+indent-guides-init-faces-h)
+  (when doom-init-theme-p
+    (+indent-guides-init-faces-h))
 
   ;; `highlight-indent-guides' breaks when `org-indent-mode' is active
   (add-hook! 'org-mode-local-vars-hook