diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/DBCheckpointServlet.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/DBCheckpointServlet.java
index cb1fdd3375a8..a40aba548424 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/DBCheckpointServlet.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/DBCheckpointServlet.java
@@ -107,6 +107,14 @@ public void initialize(DBStore store, DBCheckpointMetrics metrics,
     }
     bootstrapTempData = Paths.get(tempData,
         "temp-bootstrap-data").toFile();
+    if (bootstrapTempData.exists()) {
+      try {
+        FileUtils.cleanDirectory(bootstrapTempData);
+      } catch (IOException e) {
+        LOG.error("Failed to clean-up: {} dir.", bootstrapTempData);
+        throw new ServletException("Failed to clean-up: " + bootstrapTempData);
+      }
+    }
     if (!bootstrapTempData.exists() &&
         !bootstrapTempData.mkdirs()) {
       throw new ServletException("Failed to make:" + bootstrapTempData);