diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/Metrics.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/Metrics.java
index f71d394238ea3..47ee23bcc2fb6 100644
--- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/Metrics.java
+++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/Metrics.java
@@ -86,6 +86,8 @@ public static synchronized Metrics getInstance(HoodieWriteConfig metricConfig) {
 
   public static synchronized void shutdownAllMetrics() {
     METRICS_INSTANCE_PER_BASEPATH.values().forEach(Metrics::shutdown);
+    // to avoid reusing already stopped metrics
+    METRICS_INSTANCE_PER_BASEPATH.clear();
   }
 
   private List<MetricsReporter> addAdditionalMetricsExporters(HoodieWriteConfig metricConfig) {