diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 345b935d5b0ad0b24426bb663bb92c69a0740ca6..2459b715e8e3660cf8184e32aa02734d099aa738 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -111,6 +111,8 @@ public class Router {
         };
         _shutdownHook = new ShutdownHook();
         _gracefulShutdownDetector = new I2PThread(new GracefulShutdown());
+        _gracefulShutdownDetector.setDaemon(true);
+        _gracefulShutdownDetector.setName("Graceful shutdown hook");
         _gracefulShutdownDetector.start();
     }