diff --git a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
index a2a0dd439..8532ea8da 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
@@ -225,17 +225,17 @@ class Gateways
                         }
                         $gwkey = $this->newKey($thisconf['priority'], !empty($thisconf['defaultgw']));
                         $this->cached_gateways[$gwkey] = $thisconf;
-                    } elseif (!empty($this->ifconfig[$thisconf["if"]]["tunnel"]["dest_addr"])) {
-                        // tunnel devices with a known endpoint
-                        $thisconf['gateway'] = $this->ifconfig[$thisconf["if"]]["tunnel"]["dest_addr"];
-                        $tunnel_ipproto = strpos($thisconf['gateway'], ":") != false ? "inet6" : "inet";
-                        if ($tunnel_ipproto == $ipproto) {
-                            if (empty($thisconf['monitor_disable']) && empty($thisconf['monitor'])) {
-                                $thisconf['monitor'] = $thisconf['gateway'];
-                            }
-                            $gwkey = $this->newKey($thisconf['priority'], !empty($thisconf['defaultgw']));
-                            $this->cached_gateways[$gwkey] = $thisconf;
-                        }
+                    // } elseif (!empty($this->ifconfig[$thisconf["if"]]["tunnel"]["dest_addr"])) {
+                    //     // tunnel devices with a known endpoint
+                    //     $thisconf['gateway'] = $this->ifconfig[$thisconf["if"]]["tunnel"]["dest_addr"];
+                    //     $tunnel_ipproto = strpos($thisconf['gateway'], ":") != false ? "inet6" : "inet";
+                    //     if ($tunnel_ipproto == $ipproto) {
+                    //         if (empty($thisconf['monitor_disable']) && empty($thisconf['monitor'])) {
+                    //             $thisconf['monitor'] = $thisconf['gateway'];
+                    //         }
+                    //         $gwkey = $this->newKey($thisconf['priority'], !empty($thisconf['defaultgw']));
+                    //         $this->cached_gateways[$gwkey] = $thisconf;
+                    //     }
                     } elseif (self::convertType($ipproto, $ifcfg) != null) {
                         // other predefined types, only bound by interface (e.g. openvpn)
                         $gwkey = $this->newKey($thisconf['priority'], !empty($thisconf['defaultgw']));