diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java
index ab768e9d..a0d7a37f 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java
@@ -221,7 +221,7 @@ public class MapDBPersistentStore implements IMessagesStore, ISessionsStore {
     public void close() {
         LOG.debug("closing disk storage");
         this.m_db.commit();
-        this.m_db.close();
+//        this.m_db.close(); this is done by the Shutdown hook into MapDB
     }
 
     /*-------- QoS 2  storage management --------------*/