diff --git a/core/core.el b/core/core.el
index eec32a36d..789574a75 100644
--- a/core/core.el
+++ b/core/core.el
@@ -310,11 +310,12 @@ users).")
 ;; HACK `tty-run-terminal-initialization' is *tremendously* slow for some
 ;;      reason. Disabling it completely could have many side-effects, so we
 ;;      defer it until later, at which time it (somehow) runs very quickly.
-(advice-add #'tty-run-terminal-initialization :override #'ignore)
-(add-hook! 'window-setup-hook
-  (defun doom-init-tty-h ()
-    (advice-remove #'tty-run-terminal-initialization #'ignore)
-    (tty-run-terminal-initialization (selected-frame) nil t)))
+(unless (daemonp)
+  (advice-add #'tty-run-terminal-initialization :override #'ignore)
+  (add-hook! 'window-setup-hook
+    (defun doom-init-tty-h ()
+      (advice-remove #'tty-run-terminal-initialization #'ignore)
+      (tty-run-terminal-initialization (selected-frame) nil t))))
 
 
 ;;