diff --git a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
index 68420a0344..dbe95ebe1c 100644
--- a/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
+++ b/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
@@ -228,6 +228,7 @@ public class KahaStore implements Store{
         if(container!=null){
             container.clear();
             mapsContainer.removeRoot(container.getIndexManager(),containerId);
+            container.close();
         }
     }
 
@@ -295,6 +296,7 @@ public class KahaStore implements Store{
         if(container!=null){
             listsContainer.removeRoot(container.getIndexManager(),containerId);
             container.clear();
+            container.close();
         }
     }