diff --git a/impl/src/main/java/org/opencord/olt/impl/Olt.java b/impl/src/main/java/org/opencord/olt/impl/Olt.java
index c5f7806..79d30c6 100644
--- a/impl/src/main/java/org/opencord/olt/impl/Olt.java
+++ b/impl/src/main/java/org/opencord/olt/impl/Olt.java
@@ -230,6 +230,7 @@
     protected void deactivate(ComponentContext context) {
         cfgService.unregisterProperties(getClass(), false);
         discoveredSubscriberExecutor.shutdown();
+        deviceService.removeListener(deviceListener);
         flowsExecutor.shutdown();
         subscriberExecutor.shutdown();
         deviceListener.deactivate();
@@ -633,7 +634,6 @@
     }
 
     protected void unbindSadisService(SadisService service) {
-        deviceService.removeListener(deviceListener);
         deviceListener = null;
         sadisService = null;
         subsService = null;