diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index d7896a1..8cd657b 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -442,6 +442,8 @@
         cordConfigService.removeListener(cordConfigListener);
         routeService.removeListener(routeListener);
 
+        neighbourResolutionService.unregisterNeighbourHandlers(appId);
+
         processor = null;
         linkListener = null;
         deviceListener = null;
@@ -1063,7 +1065,7 @@
      * @param portToRegister connect point to register
      */
     public void registerConnectPoint(ConnectPoint portToRegister) {
-        this.neighbourResolutionService.registerNeighbourHandler(
+        neighbourResolutionService.registerNeighbourHandler(
                 portToRegister,
                 neighbourHandler,
                 appId