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 ffba7583c9..10bab528b9 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
@@ -191,7 +191,7 @@ public class TenantRepo {
                 getEntitySet(entityType).add(entityData);
             }
 
-            UUID newCustomerId = fields.getCustomerId();
+            UUID newCustomerId = CustomerId.NULL_UUID.equals(fields.getCustomerId()) ? null : fields.getCustomerId();
             UUID oldCustomerId = entityData.getCustomerId();
             entityData.setCustomerId(newCustomerId);
             if (entityIdMismatch(oldCustomerId, newCustomerId)) {