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 cb1aa9300d..e6dad28193 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
@@ -63,7 +63,12 @@ public class AbstractEntityFields implements EntityFields {
     }
 
     protected UUID checkId(UUID id) {
-        return id != null && !id.equals(EntityId.NULL_UUID) ? id : null;
+        return id == null || id.equals(EntityId.NULL_UUID) ? null : id;
+    }
+
+    @Override
+    public UUID getCustomerId() {
+        return checkId(customerId);
     }
 
 }