diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
index 794218f66d..65190b3c5c 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
@@ -121,6 +121,9 @@ public class KahaMessageStore implements MessageStore, UsageListener{
                 }
             }
         }
+        if (messageContainer.isEmpty()) {
+            batchEntry = null;
+        }
     }
 
     public synchronized void recover(MessageRecoveryListener listener) throws Exception{