diff --git a/net/coova-chilli/files/chilli.init b/net/coova-chilli/files/chilli.init
index 1c163a0d6..d5c0ce4c4 100644
--- a/net/coova-chilli/files/chilli.init
+++ b/net/coova-chilli/files/chilli.init
@@ -78,6 +78,9 @@ start_service() {
 }
 
 stop_service() {
+	for undofile in /var/run/chilli.tun*.sh; do
+		sh $undofile >& /dev/null
+	done
 	rm -f /var/run/chilli_*
 }