diff --git a/feeds/third-party/chilli-redirect/files/etc/uci-defaults/99-chilli b/feeds/third-party/chilli-redirect/files/etc/uci-defaults/99-chilli
index 52eda7650..9c6631515 100644
--- a/feeds/third-party/chilli-redirect/files/etc/uci-defaults/99-chilli
+++ b/feeds/third-party/chilli-redirect/files/etc/uci-defaults/99-chilli
@@ -21,3 +21,4 @@ config chilli
 	option kname 'chilli'
 	option debug 0
 EOF
+/etc/init.d/chilli disable
diff --git a/feeds/third-party/coova-chilli/files/chilli.hotplug b/feeds/third-party/coova-chilli/files/chilli.hotplug
index e12812b49..b03e0479a 100644
--- a/feeds/third-party/coova-chilli/files/chilli.hotplug
+++ b/feeds/third-party/coova-chilli/files/chilli.hotplug
@@ -2,6 +2,6 @@
 
 [ "$ACTION" == "ifup" ] || exit 0
 
-[ "$INTERFACE" = "wan" ] && {
+[ "$INTERFACE" = "wan" -a "$(uci get chilli.@chilli[-1].disabled)" -neq 0 ] && {
 	/etc/init.d/chilli restart
 }