diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php
index 240b3e930..7a3b2ffa6 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php
@@ -234,6 +234,10 @@ class FilterRule
                                               "/" . $tmp['max-src-conn-rates'] . ", overload <virusprot> flush global ";
                     }
                 }
+                // icmpv6
+                if ($ipproto == 'inet6' && !empty($tmp['protocol']) && $tmp['protocol'] == "icmp") {
+                    $tmp['protocol'] = 'ipv6-icmp';
+                }
                 $result[] = $tmp;
             }
         }