diff --git a/src/www/system_gateways_edit.php b/src/www/system_gateways_edit.php
index 8c30a7f3d..c7ba69ceb 100644
--- a/src/www/system_gateways_edit.php
+++ b/src/www/system_gateways_edit.php
@@ -129,7 +129,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
                         }
                     }
 
-                    if (!$found) {
+                    if (!$found && !isset($pconfig['fargw'])) {
                         $input_errors[] = sprintf(gettext('The gateway address "%s" does not lie within one of the chosen interface\'s IPv6 subnets.'), $pconfig['gateway']);
                     }
                 }