diff --git a/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java
index 2d89c2b3..cd681911 100644
--- a/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java
@@ -31,7 +31,7 @@ public class UploadDeviceTokenHandler extends IMHandler<WFCMessage.UploadDeviceT
                 session.setDeviceToken(request.getDeviceToken());
                 session.setPushType(request.getPushType());
                 m_sessionsStore.updateSessionToken(session, false);
-                m_sessionsStore.cleanDuplatedToken(session.getClientID(), session.getPushType(), session.getDeviceToken(), false);
+                m_sessionsStore.cleanDuplatedToken(session.getClientID(), session.getPushType(), session.getDeviceToken(), false, session.getAppName());
             }
 
             return ErrorCode.ERROR_CODE_SUCCESS;
diff --git a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
index 158b071c..ac88d27f 100755
--- a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
@@ -285,7 +285,7 @@ public class MemorySessionStore implements ISessionsStore {
     }
 
     @Override
-    public void cleanDuplatedToken(String cid, int pushType, String token, boolean isVoip) {
+    public void cleanDuplatedToken(String cid, int pushType, String token, boolean isVoip, String packageName) {
         if (StringUtil.isNullOrEmpty(token) || isVoip) {
             return;
         }
@@ -293,7 +293,7 @@ public class MemorySessionStore implements ISessionsStore {
         Iterator<Map.Entry<String, Session>> it = sessions.entrySet().iterator();
         while (it.hasNext()) {
             Session session = it.next().getValue();
-            if (!session.getClientID().equals(cid) && (session.pushType == pushType && token.equals(session.deviceToken))) {
+            if (!session.getClientID().equals(cid) && (session.pushType == pushType && token.equals(session.deviceToken)) && (!StringUtil.isNullOrEmpty(packageName) && packageName.equals(session.getAppName()))) {
                 session.deviceToken = null;
             }
         }
diff --git a/broker/src/main/java/io/moquette/spi/ISessionsStore.java b/broker/src/main/java/io/moquette/spi/ISessionsStore.java
index 9f3a6697..eca5ae83 100755
--- a/broker/src/main/java/io/moquette/spi/ISessionsStore.java
+++ b/broker/src/main/java/io/moquette/spi/ISessionsStore.java
@@ -46,7 +46,7 @@ public interface ISessionsStore {
 
     Session getSession(String clientID);
 
-    void cleanDuplatedToken(String cid, int pushType, String token, boolean isVoip);
+    void cleanDuplatedToken(String cid, int pushType, String token, boolean isVoip, String packageName);
 
     void updateSessionToken(Session session, boolean voip);