diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
index de3dd3c4..4a592a12 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
@@ -169,9 +169,8 @@ public class SubscriptionsStore {
      */
     public void removeForClient(String clientID) {
         subscriptions.removeClientSubscriptions(clientID);
-        //TODO persist the update
-        //remove from log all subscriptions
-//        m_storageService.removeAllSubscriptions(clientID);
+        //persist the update
+        m_sessionsStore.wipeSubscriptions(clientID);
     }
 
     public void deactivate(String clientID) {