diff --git a/init.d/basics/global-variables.el b/init.d/basics/global-variables.el
index d62c297..3e6455f 100644
--- a/init.d/basics/global-variables.el
+++ b/init.d/basics/global-variables.el
@@ -66,7 +66,7 @@ If t, run `whitespace-cleanup', `clang-format-buffer' and so on."
 
 (use-package with-editor
   :after (server)
-  :defer nil
+  :demand t
   :config (progn
             (setenv "EDITOR" (with-editor-locate-emacsclient))))