diff --git a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
index d9cf35cc1..a3fb6e820 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
@@ -44,19 +44,14 @@ class Gateways
 
     /**
      * Construct new gateways object
+     * @param array $ifconfig containing serialized ifconfig data
      */
-    public function __construct()
+    public function __construct(array $ifconfig)
     {
         $this->configHandle = Config::getInstance()->object();
-    }
-
-    /**
-     * @param array $payload containing serialized ifconfig data
-     */
-    public function setIfconfig($payload)
-    {
-        $this->ifconfig = $payload;
-        return $this;
+        if ($ifconfig !== null) {
+            $this->ifconfig = $ifconfig;
+        }
     }
 
     /**
diff --git a/src/www/system_gateways.php b/src/www/system_gateways.php
index b95c7863f..c8bd037b0 100644
--- a/src/www/system_gateways.php
+++ b/src/www/system_gateways.php
@@ -109,7 +109,7 @@ function delete_gateway_item($id, $a_gateways)
 }
 
 // fetch gateway list including active default for IPv4/IPv6
-$gateways = (new \OPNsense\Routing\Gateways())->setIfconfig(legacy_interfaces_details());
+$gateways = new \OPNsense\Routing\Gateways(legacy_interfaces_details());
 $default_gwv4 = $gateways->getDefaultGW(return_down_gateways(), "inet");
 $default_gwv6 = $gateways->getDefaultGW(return_down_gateways(), "inet6");
 $a_gateways = array_values($gateways->gatewaysIndexedByName(true, false, true));
diff --git a/src/www/system_gateways_edit.php b/src/www/system_gateways_edit.php
index aa37ff787..60a7548c6 100644
--- a/src/www/system_gateways_edit.php
+++ b/src/www/system_gateways_edit.php
@@ -31,7 +31,7 @@ require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 
-$gateways = (new \OPNsense\Routing\Gateways())->setIfconfig(legacy_interfaces_details());
+$gateways = new \OPNsense\Routing\Gateways(legacy_interfaces_details());
 $a_gateways = array_values($gateways->gatewaysIndexedByName(true, false, true));
 $dpinger_default = return_dpinger_defaults();
 
diff --git a/src/www/system_general.php b/src/www/system_general.php
index 120997d80..08138836b 100644
--- a/src/www/system_general.php
+++ b/src/www/system_general.php
@@ -33,7 +33,7 @@ require_once("system.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 
-$a_gateways = (new \OPNsense\Routing\Gateways())->setIfconfig(legacy_interfaces_details())->gatewaysIndexedByName();
+$a_gateways = (new \OPNsense\Routing\Gateways(legacy_interfaces_details()))->gatewaysIndexedByName();
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = array();