diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp
index 2667052..7932210 100644
--- a/redfish-core/lib/ethernet.hpp
+++ b/redfish-core/lib/ethernet.hpp
@@ -855,8 +855,9 @@
             // Fix global GW
             for (IPv4AddressData &ipv4 : ipv4Data)
             {
-                if ((ipv4.linktype == LinkType::Global) &&
-                    (ipv4.gateway == "0.0.0.0"))
+                if (((ipv4.linktype == LinkType::Global) &&
+                     (ipv4.gateway == "0.0.0.0")) ||
+                    (ipv4.origin == "DHCP"))
                 {
                     ipv4.gateway = ethData.default_gateway;
                 }