diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
index 8ad0a5e66f2fb..56886c0f37ba8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
@@ -386,14 +386,19 @@ public void remove(String regName) {
 
         notifyListeners(mreg, metricRegRemoveLsnrs, log);
 
+        DistributedMetaStorage metastorage0 = metastorage;
+
+        if (metastorage0 == null)
+            return;
+
         try {
             GridCompoundFuture opsFut = new GridCompoundFuture<>();
 
             for (Metric m : mreg) {
                 if (m instanceof HitRateMetric)
-                    opsFut.add(metastorage.removeAsync(metricName(HITRATE_CFG_PREFIX, m.name())));
+                    opsFut.add(metastorage0.removeAsync(metricName(HITRATE_CFG_PREFIX, m.name())));
                 else if (m instanceof HistogramMetric)
-                    opsFut.add(metastorage.removeAsync(metricName(HISTOGRAM_CFG_PREFIX, m.name())));
+                    opsFut.add(metastorage0.removeAsync(metricName(HISTOGRAM_CFG_PREFIX, m.name())));
             }
 
             opsFut.markInitialized();