diff --git a/etc/init.d/firewall b/etc/init.d/firewall
index 873ae1c..7c63893 100644
--- a/etc/init.d/firewall
+++ b/etc/init.d/firewall
@@ -389,8 +389,12 @@ if [ -f "$CFGFILE" ]; then
 		evaluate_retval
 		;;
 	stop)
+		for i in filter nat mangle raw; do
+			$DEBUG $IPTABLES -t $i -F
+			$DEBUG $IPTABLES -t $i -X
+		done
+
 		for i in INPUT FORWARD OUTPUT; do
-			$DEBUG $IPTABLES -F $i
 			$DEBUG $IPTABLES -P $i ACCEPT
 		done
 		if [ "$ACCOUNTING" == "yes" ]; then