diff --git a/apps/mcast/impl/src/main/java/org/onosproject/mcast/impl/DistributedMcastRoutesStore.java b/apps/mcast/impl/src/main/java/org/onosproject/mcast/impl/DistributedMcastRoutesStore.java
index 2d86104..6dc6c3d 100644
--- a/apps/mcast/impl/src/main/java/org/onosproject/mcast/impl/DistributedMcastRoutesStore.java
+++ b/apps/mcast/impl/src/main/java/org/onosproject/mcast/impl/DistributedMcastRoutesStore.java
@@ -94,7 +94,6 @@
     @Deactivate
     public void deactivate() {
         mcastRib.removeListener(mcastRouteListener);
-        mcastRib.destroy();
         log.info("Stopped");
     }
 
diff --git a/core/store/dist/src/main/java/org/onosproject/store/meter/impl/DistributedMeterStore.java b/core/store/dist/src/main/java/org/onosproject/store/meter/impl/DistributedMeterStore.java
index 30da74d..43188c1 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/meter/impl/DistributedMeterStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/meter/impl/DistributedMeterStore.java
@@ -191,8 +191,10 @@
     public void deactivate() {
         meters.removeListener(metersMapListener);
         metersFeatures.removeListener(featuresMapListener);
-        meters.destroy();
+
+        // EC map does clean only the local state
         metersFeatures.destroy();
+        // Distributed set does not override the default behavior
         availableMeterIds.forEach((key, set) -> set.destroy());
 
         log.info("Stopped");