diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index ea407f081b..829719c279 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=24
+PKG_RELEASE:=25
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh
index ed6a4b150f..bc9eb96dde 100644
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -8,6 +8,7 @@ fw__uci_state_add() {
 	val="${val// $item / }"
 	val="${val# }"
 	val="${val% }"
+	uci_revert_state firewall core $var
 	uci_set_state firewall core $var "${val:+$val }$item"
 }
 
@@ -19,6 +20,7 @@ fw__uci_state_del() {
 	val="${val// $item / }"
 	val="${val# }"
 	val="${val% }"
+	uci_revert_state firewall core $var
 	uci_set_state firewall core $var "$val"
 }