diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index a6e00d48c63..1431b2f6ccd 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -262,10 +262,12 @@ public class Server extends HandlerWrapper implements Attributes
     @Override
     protected void doStart() throws Exception
     {
-        if (getStopAtShutdown()) {
-            ShutdownThread.register(this);
-            ShutdownMonitor.getInstance().start(); // initialize
+        if (getStopAtShutdown())
+        {
+            ShutdownThread.register(this);    
         }
+        
+        ShutdownMonitor.getInstance().start(); // initialize
 
         LOG.info("jetty-"+__version);
         HttpGenerator.setServerVersion(__version);
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java
index 405ce12f6fa..39d38e71af1 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java
@@ -75,7 +75,7 @@ public class ShutdownMonitor extends Thread
 
         // Use values passed thru via /jetty-start/
         this.port = Integer.parseInt(props.getProperty("STOP.PORT","-1"));
-        this.key = props.getProperty("STOP.KEY","eclipse");
+        this.key = props.getProperty("STOP.KEY",null);
         this.exitVm = true;
     }