diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
index d80b6b3a272c..fc164da36a1f 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
@@ -637,8 +637,10 @@ public static void includeFile(File file, String entryName,
     archiveOutputStream.putArchiveEntry(archiveEntry);
     try (FileInputStream fis = new FileInputStream(file)) {
       IOUtils.copy(fis, archiveOutputStream);
+      archiveOutputStream.flush();
+    } finally {
+      archiveOutputStream.closeArchiveEntry();
     }
-    archiveOutputStream.closeArchiveEntry();
   }
 
   // Mark tarball completed.