diff --git a/core/core-editor.el b/core/core-editor.el
index 0e7be0e69..1ce50532b 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -72,11 +72,6 @@ fundamental-mode) for performance sake."
 
 (electric-indent-mode -1) ; enabled by default in Emacs 25+. No thanks.
 
-(when (and (display-graphic-p)
-           (require 'server nil t)
-           (not (server-running-p)))
-  (server-start))
-
 (add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
 
 ;; revert buffers for changed files
@@ -128,6 +123,14 @@ fundamental-mode) for performance sake."
               (lambda (file) (file-in-directory-p file doom-local-dir))))
   (recentf-mode +1))
 
+(def-package! server
+  :when (display-graphic-p)
+  :defer 1
+  :after-call (pre-command-hook after-find-file)
+  :config
+  (unless (server-running-p)
+    (server-start)))
+
 
 ;;
 ;; Core Plugins