diff --git a/modules/ui/tabs/config.el b/modules/ui/tabs/config.el
index baa8e3219..8ff2dc590 100644
--- a/modules/ui/tabs/config.el
+++ b/modules/ui/tabs/config.el
@@ -10,7 +10,7 @@
 ;;; Packages
 
 (use-package! centaur-tabs
-  :hook (doom-first-file . centaur-tabs-mode)
+  :defer t
   :init
   (setq centaur-tabs-set-icons t
         centaur-tabs-gray-out-icons 'buffer
@@ -24,6 +24,10 @@
         ;; prevents that.
         centaur-tabs-cycle-scope 'tabs)
 
+  (if (daemonp)
+      (add-hook 'server-after-make-frame-hook #'centaur-tabs-mode)
+    (add-hook 'doom-first-file-hook #'centaur-tabs-mode))
+
   :config
   (add-hook! '(+doom-dashboard-mode-hook +popup-buffer-mode-hook)
     (defun +tabs-disable-centaur-tabs-mode-maybe-h ()