diff --git a/apps/portloadbalancer/src/main/java/org/onosproject/portloadbalancer/app/PortLoadBalancerManager.java b/apps/portloadbalancer/src/main/java/org/onosproject/portloadbalancer/app/PortLoadBalancerManager.java
index ed59699..b040147 100644
--- a/apps/portloadbalancer/src/main/java/org/onosproject/portloadbalancer/app/PortLoadBalancerManager.java
+++ b/apps/portloadbalancer/src/main/java/org/onosproject/portloadbalancer/app/PortLoadBalancerManager.java
@@ -171,6 +171,8 @@
         portLoadBalancerStore.removeListener(portLoadBalancerStoreListener);
         portLoadBalancerNextStore.removeListener(portLoadBalancerNextStoreListener);
 
+        deviceService.removeListener(deviceListener);
+
         portLoadBalancerEventExecutor.shutdown();
         portLoadBalancerProvExecutor.shutdown();
         deviceEventExecutor.shutdown();
diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
index 7a579b2..102d469 100644
--- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
+++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
@@ -250,6 +250,7 @@
         xconnectStore.removeListener(xconnectListener);
         deviceService.removeListener(deviceListener);
         hostService.removeListener(hostListener);
+        portLoadBalancerService.removeListener(portLoadBalancerListener);
         codecService.unregisterCodec(XconnectDesc.class);
 
         deviceEventExecutor.shutdown();