diff --git a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/TunnelControl.java b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/TunnelControl.java
index 01ea39d..e7c6109 100644
--- a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/TunnelControl.java
+++ b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/TunnelControl.java
@@ -36,8 +36,9 @@ public class TunnelControl implements Runnable {
     this.router = router;
     tunnelControlTempDir.delete();
     tunnelControlTempDir.mkdir();
+
     this.tunnelControlTempDir = tunnelControlTempDir;
-    this.tunnelControlTempDir.deleteOnExit();
+    Runtime.getRuntime().addShutdownHook(new Thread(()->this.tunnelControlTempDir.delete()));
   }
 
   public interface Tunnel {