diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/PartitionManager.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/PartitionManager.java
index c130432..b3e193e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/PartitionManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/PartitionManager.java
@@ -86,6 +86,8 @@
 
     @Deactivate
     public void deactivate() {
+        executor.shutdownNow();
+
         leadershipService.removeListener(leaderListener);
         clusterService.removeListener(clusterListener);
     }