diff --git a/core/core-editor.el b/core/core-editor.el
index 0962c5a7b..3398f59e3 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -146,6 +146,8 @@ savehist file."
   :defer 1
   :after-call (pre-command-hook after-find-file)
   :config
+  (when-let* ((name (getenv "EMACS_SERVER_NAME")))
+    (setq server-name name))
   (unless (server-running-p)
     (server-start)))