diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
index dcbf3ad65bd5..5f08c52c1cdc 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
@@ -101,9 +101,11 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut
           continue;
         }
         SnapshotInfo nextSnapshot = SnapshotUtils.getNextSnapshot(ozoneManager, snapshotChainManager, fromSnapshot);
-
-        // Step 1: Update the deep clean flag for the next active snapshot
+        SnapshotInfo nextToNextSnapshot = nextSnapshot == null ? null : SnapshotUtils.getNextSnapshot(ozoneManager,
+            snapshotChainManager, nextSnapshot);
+        // Step 1: Update the deep clean flag for the next snapshot
         updateSnapshotInfoAndCache(nextSnapshot, omMetadataManager, trxnLogIndex);
+        updateSnapshotInfoAndCache(nextToNextSnapshot, omMetadataManager, trxnLogIndex);
         // Step 2: Update the snapshot chain.
         updateSnapshotChainAndCache(omMetadataManager, fromSnapshot, trxnLogIndex);
         // Step 3: Purge the snapshot from SnapshotInfoTable cache and also remove from the map.
@@ -140,6 +142,7 @@ private void updateSnapshotInfoAndCache(SnapshotInfo snapInfo, OmMetadataManager
       // current snapshot is deleted. We can potentially
       // reclaim more keys in the next snapshot.
       snapInfo.setDeepClean(false);
+      snapInfo.setDeepCleanedDeletedDir(false);
 
       // Update table cache first
       omMetadataManager.getSnapshotInfoTable().addCacheEntry(new CacheKey<>(snapInfo.getTableKey()),
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
index 108047f22b30..db870e8480e5 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
@@ -394,7 +394,11 @@ public void testSnapshotChainInSnapshotInfoTableAfterSnapshotPurge(
             SnapshotInfo.getTableKey(getVolumeName(), bucket, snapshotName);
         SnapshotInfo snapshotInfo =
             getOmMetadataManager().getSnapshotInfoTable().get(snapshotTableKey);
-        snapshotInfoList.add(snapshotInfo);
+        snapshotInfo.setDeepClean(true);
+        snapshotInfo.setDeepCleanedDeletedDir(true);
+        getOmMetadataManager().getSnapshotInfoTable().addCacheEntry(snapshotTableKey, snapshotInfo,
+            System.currentTimeMillis());
+        snapshotInfoList.add(getOmMetadataManager().getSnapshotInfoTable().get(snapshotTableKey));
       }
     }
 
@@ -403,13 +407,16 @@ public void testSnapshotChainInSnapshotInfoTableAfterSnapshotPurge(
     assertEquals(totalKeys, numberOfSnapshotBeforePurge);
     assertEquals(totalKeys, chainManager.getGlobalSnapshotChain().size());
     Map<UUID, ByteString> expectedTransactionInfos = new HashMap<>();
+    Map<UUID, Boolean> expectedDeepCleanFlags = new HashMap<>();
     // Ratis transaction uses term index 1 while creating snapshot.
     ByteString expectedLastTransactionVal = TransactionInfo.valueOf(TransactionInfo.getTermIndex(1L))
         .toByteString();
     for (SnapshotInfo snapshotInfo : snapshotInfoList) {
       expectedTransactionInfos.put(snapshotInfo.getSnapshotId(), expectedLastTransactionVal);
+      expectedDeepCleanFlags.put(snapshotInfo.getSnapshotId(), true);
     }
-    validateSnapshotOrderInSnapshotInfoTableAndSnapshotChain(snapshotInfoList, expectedTransactionInfos);
+    validateSnapshotOrderInSnapshotInfoTableAndSnapshotChain(snapshotInfoList, expectedTransactionInfos,
+        expectedDeepCleanFlags);
     // Ratis transaction uses term index 200 while purging snapshot.
     expectedLastTransactionVal = TransactionInfo.valueOf(TransactionInfo.getTermIndex(200L))
         .toByteString();
@@ -422,8 +429,15 @@ public void testSnapshotChainInSnapshotInfoTableAfterSnapshotPurge(
         expectedTransactionInfos.put(chainManager.nextGlobalSnapshot(snapId), expectedLastTransactionVal);
       }
       if (chainManager.hasNextPathSnapshot(purgeSnapshotInfo.getSnapshotPath(), snapId)) {
-        expectedTransactionInfos.put(chainManager.nextPathSnapshot(purgeSnapshotInfo.getSnapshotPath(), snapId),
-            expectedLastTransactionVal);
+        UUID nextPathSnapshot = chainManager.nextPathSnapshot(purgeSnapshotInfo.getSnapshotPath(), snapId);
+        expectedTransactionInfos.put(nextPathSnapshot, expectedLastTransactionVal);
+        expectedDeepCleanFlags.put(nextPathSnapshot, false);
+        if (chainManager.hasNextPathSnapshot(purgeSnapshotInfo.getSnapshotPath(), nextPathSnapshot)) {
+          UUID nextToNextPathSnapshot = chainManager.nextPathSnapshot(purgeSnapshotInfo.getSnapshotPath(),
+              nextPathSnapshot);
+          expectedTransactionInfos.put(nextToNextPathSnapshot, expectedLastTransactionVal);
+          expectedDeepCleanFlags.put(nextToNextPathSnapshot, false);
+        }
       }
       String purgeSnapshotKey = SnapshotInfo.getTableKey(getVolumeName(),
           purgeSnapshotInfo.getBucketName(),
@@ -453,16 +467,20 @@ public void testSnapshotChainInSnapshotInfoTableAfterSnapshotPurge(
         actualNumberOfSnapshotAfterPurge);
     assertEquals(expectNumberOfSnapshotAfterPurge, chainManager
         .getGlobalSnapshotChain().size());
-    validateSnapshotOrderInSnapshotInfoTableAndSnapshotChain(snapshotInfoListAfterPurge, expectedTransactionInfos);
+    validateSnapshotOrderInSnapshotInfoTableAndSnapshotChain(snapshotInfoListAfterPurge, expectedTransactionInfos,
+        expectedDeepCleanFlags);
   }
 
   private void validateSnapshotOrderInSnapshotInfoTableAndSnapshotChain(
-      List<SnapshotInfo> snapshotInfoList, Map<UUID, ByteString> expectedTransactionInfos) throws IOException {
+      List<SnapshotInfo> snapshotInfoList, Map<UUID, ByteString> expectedTransactionInfos,
+      Map<UUID, Boolean> expectedDeepCleanFlags) throws IOException {
     if (snapshotInfoList.isEmpty()) {
       return;
     }
     for (SnapshotInfo snapshotInfo : snapshotInfoList) {
       assertEquals(snapshotInfo.getLastTransactionInfo(), expectedTransactionInfos.get(snapshotInfo.getSnapshotId()));
+      assertEquals(snapshotInfo.getDeepClean(), expectedDeepCleanFlags.get(snapshotInfo.getSnapshotId()));
+      assertEquals(snapshotInfo.getDeepCleanedDeletedDir(), expectedDeepCleanFlags.get(snapshotInfo.getSnapshotId()));
     }
     OmMetadataManagerImpl metadataManager =
         (OmMetadataManagerImpl) getOmMetadataManager();