diff --git a/src/service/service/service_handlers/l3nm_gnmi_openconfig/ConfigRuleComposer.py b/src/service/service/service_handlers/l3nm_gnmi_openconfig/ConfigRuleComposer.py
index 54101d0412c6eec02e039a8bcd1d81bab9ba115c..ec03f1b7a355f326f9140103a77d873025a28d09 100644
--- a/src/service/service/service_handlers/l3nm_gnmi_openconfig/ConfigRuleComposer.py
+++ b/src/service/service/service_handlers/l3nm_gnmi_openconfig/ConfigRuleComposer.py
@@ -201,7 +201,8 @@ class DeviceComposer:
                 endpoint.ipv4_prefix_len = ipv4_prefix_len
                 endpoint.sub_interface_index = int(subif_index)
                 endpoint_ip_network = netaddr.IPNetwork('{:s}/{:d}'.format(ipv4_network, ipv4_prefix_len))
-                self.connected.add(str(endpoint_ip_network.cidr))
+                if '0.0.0.0/' not in str(endpoint_ip_network.cidr):
+                    self.connected.add(str(endpoint_ip_network.cidr))
 
             match = RE_SR.match(config_rule_custom.resource_key)
             if match is not None:
diff --git a/src/service/service/service_handlers/l3nm_gnmi_openconfig/StaticRouteGenerator.py b/src/service/service/service_handlers/l3nm_gnmi_openconfig/StaticRouteGenerator.py
index c52321473641a4f251d40426011aa3a962955b7a..b315c7f4d44c7f806a68b8466c393c1668d1d3bb 100644
--- a/src/service/service/service_handlers/l3nm_gnmi_openconfig/StaticRouteGenerator.py
+++ b/src/service/service/service_handlers/l3nm_gnmi_openconfig/StaticRouteGenerator.py
@@ -138,6 +138,7 @@ class StaticRouteGenerator:
             if endpoint.ipv4_address is None: continue
             ip_network = _compose_ipv4_network(endpoint.ipv4_address, endpoint.ipv4_prefix_len)
 
+            if '0.0.0.0/' in str(ip_network.cidr): continue
             device.connected.add(str(ip_network.cidr))
 
     def _compute_static_routes(