diff --git a/java/net/i2p/router/WinLauncher.java b/java/net/i2p/router/WinLauncher.java
index 6ce22f2..f1ef53b 100644
--- a/java/net/i2p/router/WinLauncher.java
+++ b/java/net/i2p/router/WinLauncher.java
@@ -313,6 +313,12 @@ public class WinLauncher extends CopyConfigDir {
         logger.info(e.toString());
       }
     }
+    Runtime.getRuntime().addShutdownHook(new Thread() {
+      @Override
+      public void run() {
+        setNotStarting();
+      }
+    });
   }
 
   private static boolean checkStarting() {