diff --git a/flakes/emacs/config/init.el b/flakes/emacs/config/init.el
index 1cf7289..ff57e5c 100644
--- a/flakes/emacs/config/init.el
+++ b/flakes/emacs/config/init.el
@@ -604,9 +604,9 @@
   (savehist-mode))
 
 (use-package server
-  :defer 2
-  :config
-  (server-start))
+  :hook (after-init . (lambda ()
+                        (unless (server-running-p)
+                          (server-start)))))
 
 (use-package smartparens
   :hook ((prog-mode . smartparens-mode))