diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
index 1757ce92..29ab412f 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
@@ -198,7 +198,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, VpnMonitor.Ca
     }
 
     /**
-     * startService 2nd stop, also called when VPN re-established
+     * startService 2nd stop
      */
     private fun setup(ifname: String? = null, dns: List<InetAddress> = emptyList()) {
         val matcher = patternNetworkInfo.matcher(loggerSu("dumpsys ${Context.WIFI_P2P_SERVICE}") ?: "")
@@ -343,6 +343,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, VpnMonitor.Ca
 
     override fun onDestroy() {
         if (status != Status.IDLE) binder.shutdown()
+        clean() // force clean to prevent leakage
         super.onDestroy()
     }
 }