diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java
index d8dec9fc4e..b9f3589280 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java
@@ -220,12 +220,13 @@ public class TenantRepo {
         try {
             UUID entityId = entity.getFields().getId();
             EntityType entityType = entity.getType();
-            EntityData<?> removed = get(entityType, entityId);
+            EntityData<?> removed = getEntityMap(entityType).remove(entityId);
             if (removed != null) {
                 if (removed.getFields() != null) {
                     getEntitySet(entityType).remove(removed);
                 }
                 edqsStatsService.ifPresent(statService -> statService.reportEvent(tenantId, ObjectType.fromEntityType(entityType), EdqsEventType.DELETED));
+
                 UUID customerId = removed.getCustomerId();
                 if (customerId != null) {
                     CustomerData customerData = (CustomerData) get(EntityType.CUSTOMER, customerId);