diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AbstractEntityFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AbstractEntityFields.java
index 4aad5eb4dd..cb1aa9300d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AbstractEntityFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AbstractEntityFields.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
 import lombok.experimental.SuperBuilder;
-import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.EntityId;
 
 import java.util.UUID;
 
@@ -36,7 +36,7 @@ public class AbstractEntityFields implements EntityFields {
         this.id = id;
         this.createdTime = createdTime;
         this.tenantId = tenantId;
-        this.customerId = (customerId != null && customerId != CustomerId.NULL_UUID) ? customerId : null;
+        this.customerId = checkId(customerId);
         this.name = name;
         this.version = version;
     }
@@ -62,4 +62,8 @@ public class AbstractEntityFields implements EntityFields {
         this(id, createdTime, tenantId, null, null, null);
     }
 
+    protected UUID checkId(UUID id) {
+        return id != null && !id.equals(EntityId.NULL_UUID) ? id : null;
+    }
+
 }