diff --git a/core/core-editor.el b/core/core-editor.el
index 06fd853a1..03fa0cae3 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -65,8 +65,15 @@ fundamental-mode) for performance sake."
 ;; Built-in plugins
 ;;
 
+(push '("/[A-Z]+$" . text-mode) auto-mode-alist)
+
 (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
@@ -116,15 +123,6 @@ fundamental-mode) for performance sake."
               (concat "^" (file-truename doom-local-dir))))
   (recentf-mode +1))
 
-(def-package! server
-  :when (display-graphic-p)
-  :defer 2
-  :config
-  (unless (server-running-p)
-    (server-start)))
-
-(push '("/[A-Z]+$" . text-mode) auto-mode-alist)
-
 
 ;;
 ;; Core Plugins