diff --git a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
index 1958eb45b..f8002336f 100755
--- a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
+++ b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
@@ -20,6 +20,18 @@ if [ "$(uci -q get firewall.zone_vpn)" = "" ]; then
     EOF
 fi
 
+if [ "$(uci -q get firewall.@rule[5].name)" = "Allow-ICMPv6-Input" ]; then
+	uci -q batch <<-EOF >/dev/null
+		del firewall.@rule[5]
+		commit firewall
+	EOF
+fi
+if [ "$(uci -q get firewall.@rule[6].name)" = "Allow-ICMPv6-Forward" ]; then
+	uci -q batch <<-EOF >/dev/null
+		del firewall.@rule[6]
+		commit firewall
+	EOF
+fi
 if [ "$(uci -q show firewall | grep Allow-All-Ping)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		add firewall rule