diff --git a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManager.java b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManager.java
index 81e224b..50c42dd 100644
--- a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManager.java
@@ -159,6 +159,10 @@
         nextCacheEventExecutor.shutdown();
 
         super.deactivate();
+        // Due to the check in the AbstractStore we have to pass the right instance
+        // to perform a correct clean up. The unset delegate in the super class
+        // will not have any effect
+        flowObjectiveStore.unsetDelegate(delegate);
     }
 
     /**