diff --git a/lisp/server.el b/lisp/server.el
index 436a44a7e9..2bd512f52c 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -763,6 +763,9 @@ server-running-p
 Emacs process.  To check from a Lisp program whether a server was started
 by the current Emacs process, use the `server-process' variable."
   (unless name (setq name server-name))
+  (if (and (not server-use-tcp)
+	   (not (file-exists-p (expand-file-name name server-socket-dir))))
+      nil
   (condition-case nil
       (if server-use-tcp
 	  (with-temp-buffer
@@ -778,7 +781,7 @@ server-running-p
 	  :name "server-client-test" :family 'local :server nil :noquery t
 	  :service (expand-file-name name server-socket-dir)))
 	t)
-    (file-error nil)))
+    (file-error nil))))
 
 ;;;###autoload
 (define-minor-mode server-mode