diff --git a/os/utils.c b/os/utils.c
index ca18f0765..bdb35352c 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -264,7 +264,7 @@ LockServer(void)
     int len;
     char port[20];
 
-    if (nolock || NoListenAll)
+    if (nolock || NoListenAll || (displayfd != -1 && !explicit_display))
         return;
     /*
      * Path names
@@ -391,7 +391,7 @@ LockServer(void)
 void
 UnlockServer(void)
 {
-    if (nolock || NoListenAll)
+    if (nolock || NoListenAll || (displayfd != -1 && !explicit_display))
         return;
 
     if (!StillLocking) {
@@ -764,9 +764,6 @@ ProcessCommandLine(int argc, char *argv[])
         else if (strcmp(argv[i], "-displayfd") == 0) {
             if (++i < argc) {
                 displayfd = atoi(argv[i]);
-#ifdef LOCK_SERVER
-                nolock = TRUE;
-#endif
             }
             else
                 UseMsg();