diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index 309c8d31c..049977924 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -392,7 +392,7 @@ function filter_configure_sync($verbose = false)
     }
     // init interfaces and gateways
     $fw->setInterfaceMapping($cnfint);
-    $fw->setGateways(return_gateways_array());
+    $fw->setGateways(return_gateways_array(false, true));
     $fw->setGatewayGroups(return_gateway_groups_array());
     filter_core_bootstrap($fw);
 
diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php
index ef2316439..589a6e5e1 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php
@@ -175,10 +175,6 @@ class FilterRule
     {
         if (!empty($this->gatewayMapping[$value]['logic'])) {
             return " " . $this->gatewayMapping[$value]['logic'] . " ";
-        } elseif ($value === 'Null4') {
-            return ' route-to ( lo0 127.0.0.1 )';
-        } elseif ($value === 'Null6') {
-            return ' route-to ( lo0 ::1 ) ';
         } else {
             return "";
         }