diff --git a/parser/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java b/parser/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java
index d79a732e..03c15c03 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java
+++ b/parser/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java
@@ -122,7 +122,14 @@ public class MQTTHandler extends IoHandlerAdapter implements INotifier {
             }
         }
 
-        //TODO handle clean session flag once the QoS1 and QoS2
+        //TODO for QoS1 and QoS remember to store all the messages arrived to
+        //the dormat subscriptionsonce the QoS1 and QoS2
+        //handle clean session flag
+        if (msg.isCleanSession()) {
+            //remove all prev subscriptions
+            //cleanup topic subscriptions
+            m_messaging.removeSubscriptions(msg.getClientID());
+        }
 
         ConnAckMessage okResp = new ConnAckMessage();
         okResp.setReturnCode(ConnAckMessage.CONNECTION_ACCEPTED);