diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 0c4dd680..3fea643d 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -670,10 +670,11 @@ The current directory is assumed to be the project's root otherwise."
 (use-package edit-server
   :ensure t
   :commands edit-server-start
+  :defer 1
   :config
   (progn
-    (setq edit-server-new-frame nil)
-    (edit-server-start)))
+    (edit-server-start)
+    (setq edit-server-new-frame nil)))
 
 (use-package jabber
   :ensure t