diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/DatabaseHelper.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/DatabaseHelper.java
index a215a9ea52c9..cd0aa0dbe70e 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/DatabaseHelper.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/DatabaseHelper.java
@@ -85,7 +85,7 @@ private static void loadProperties() {
         throw new FileNotFoundException("property file '"
             + ParserConsts.PROPS_FILE + "' not found in the classpath");
       }
-    } catch(Exception e){
+    } catch (Exception e){
       LOG.error(e.getMessage());
     }
 
@@ -124,8 +124,9 @@ private static boolean insertAudits(String dbName, String logs)
           preparedStatement.executeBatch();
         }
       }
-      if (!auditEntries.isEmpty()) {
-        preparedStatement.executeBatch(); // insert remaining records
+      if (auditEntries.size() % batchSize != 0) {
+        // insert remaining records
+        preparedStatement.executeBatch();
       }
     }
     return true;