diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java
index d6a9d2e996..2f495a1156 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java
@@ -195,6 +195,9 @@ class CallerBufferingDataFileAppender extends DataFileAppender {
                     }
                     dataFile.closeRandomAccessFile(file);
                 }
+                if (wb != null && wb.buff != null) {
+                    wb.buff.close();
+                }
             } catch (Throwable ignore) {
             }
             shutdownDone.countDown();