diff --git a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
index 8532ea8da..55a7e20f1 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
@@ -266,8 +266,9 @@ class Gateways
                     continue;
                 } elseif (!empty($gateway['disabled'])) {
                     continue;
+                } elseif (!empty($gateway['gateway'])) {
+                    return $gateway;
                 }
-                return $gateway;
             }
         }
         // not found