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 99bbac1..0646e66 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
@@ -66,7 +66,9 @@
 import org.slf4j.Logger;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -335,6 +337,19 @@
     }
 
     @Override
+    public void purgeMeter(DeviceId deviceId) {
+
+        List<Versioned<MeterData>> metersPendingRemove = meters.stream()
+                .filter(e -> Objects.equals(e.getKey().deviceId(), deviceId))
+                .map(Map.Entry::getValue)
+                .collect(Collectors.toList());
+
+        metersPendingRemove.forEach(versionedMeterKey
+                -> deleteMeterNow(versionedMeterKey.value().meter()));
+
+    }
+
+    @Override
     public long getMaxMeters(MeterFeaturesKey key) {
         MeterFeatures features = Versioned.valueOrElse(meterFeatures.get(key), null);
         return features == null ? 0L : features.maxMeter();
