diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
index 100636ad5d..9367439d4f 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
@@ -155,7 +155,15 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer
                 }
             });
             if (!staleSubs.isEmpty()) {
-                staleSubs.forEach(subscriptionsByEntityId::remove);
+                subsLock.lock();
+                try {
+                    staleSubs.forEach(entityId -> {
+                        subscriptionsByEntityId.remove(entityId);
+                        entityUpdates.remove(entityId);
+                    });
+                } finally {
+                    subsLock.unlock();
+                }
             }
         }
     }