diff --git a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
index dd2567238..b1efd58d5 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
@@ -410,7 +410,8 @@ class Gateways
             }
             // The interface might have a gateway configured
             if (isset($this->configHandle->interfaces->$interface)) {
-                $intf_gateway = $this->configHandle->interfaces->$interface->gateway;
+                $gwfield = $ipproto == "inet" ? "gateway" : "gatewayv6";
+                $intf_gateway = $this->configHandle->interfaces->$interface->$gwfield;
             } else {
                 $intf_gateway = null;
             }