diff --git a/interface/src/network/NetworkSettingsForm.tsx b/interface/src/network/NetworkSettingsForm.tsx
index 7ff1b22ab..9e857dfdc 100644
--- a/interface/src/network/NetworkSettingsForm.tsx
+++ b/interface/src/network/NetworkSettingsForm.tsx
@@ -155,8 +155,8 @@ class NetworkSettingsForm extends React.Component<NetworkStatusFormProps> {
               margin="normal"
             />
             <TextValidator
-              validators={['required', 'isIP']}
-              errorMessages={['Gateway IP is required', 'Must be an IP address']}
+              validators={['isOptionalIP']}
+              errorMessages={['Must be an IP address']}
               name="gateway_ip"
               label="Gateway"
               fullWidth
diff --git a/lib/framework/NetworkStatus.cpp b/lib/framework/NetworkStatus.cpp
index ec1c96f8b..90c05df6e 100644
--- a/lib/framework/NetworkStatus.cpp
+++ b/lib/framework/NetworkStatus.cpp
@@ -29,9 +29,13 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) {
         root["bssid"]       = WiFi.BSSIDstr();
         root["channel"]     = WiFi.channel();
         root["subnet_mask"] = WiFi.subnetMask().toString();
-        root["gateway_ip"]  = WiFi.gatewayIP().toString();
-        IPAddress dnsIP1    = WiFi.dnsIP(0);
-        IPAddress dnsIP2    = WiFi.dnsIP(1);
+
+        if (WiFi.gatewayIP() != INADDR_NONE) {
+            root["gateway_ip"] = WiFi.gatewayIP().toString();
+        }
+
+        IPAddress dnsIP1 = WiFi.dnsIP(0);
+        IPAddress dnsIP2 = WiFi.dnsIP(1);
         if (dnsIP1 != INADDR_NONE) {
             root["dns_ip_1"] = dnsIP1.toString();
         }