diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
index 76a46f0..55562e0 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
@@ -455,7 +455,6 @@
                 srManager.interfaceService.getInterfacesByPort(connectPoint).stream()
                         .flatMap(intf -> intf.ipAddressesList().stream())
                         .map(InterfaceIpAddress::subnetAddress)
-                        .map(IpPrefix::getIp4Prefix)
                         .collect(Collectors.toSet());
 
         if (subnets.isEmpty()) {
@@ -595,7 +594,6 @@
         return null;
     }
 
-
     /**
      * Checks if the host is in the subnet defined in the router with the
      * device ID given.
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java
index 09676b1..105a1323 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java
@@ -240,7 +240,7 @@
 
     private void register(ConnectPoint connectPoint, HandlerRegistration registration) {
         synchronized (packetHandlers) {
-            if (packetHandlers.isEmpty()) {
+            if (packetHandlers.isEmpty() && requestInterceptsEnabled) {
                 requestPackets();
             }
             packetHandlers.put(connectPoint, registration);