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 59255b11cc..ab7fb3acff 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
@@ -422,19 +422,19 @@ public class TenantRepo {
     }
 
     public String getOwnerName(EntityId ownerId) {
-        if (ownerId == null || (EntityType.CUSTOMER.equals(ownerId.getEntityType()) && CustomerId.NULL_UUID.equals(ownerId.getId()))) {
-            ownerId = tenantId;
+        if (ownerId == null || (ownerId.getEntityType() == EntityType.CUSTOMER && ownerId.isNullUid())) {
+            return getOwnerEntityName(tenantId);
         }
-        return getEntityName(ownerId);
+        return getOwnerEntityName(ownerId);
     }
 
-    private String getEntityName(EntityId entityId) {
+    private String getOwnerEntityName(EntityId entityId) {
         EntityType entityType = entityId.getEntityType();
-        if (entityType == EntityType.TENANT && entityId.getId().equals(TenantId.NULL_UUID)) {
-            return "";
-        }
         return switch (entityType) {
-            case CUSTOMER, TENANT -> getEntityMap(entityType).get(entityId.getId()).getFields().getName();
+            case CUSTOMER, TENANT -> {
+                EntityFields fields = getEntityMap(entityType).get(entityId.getId()).getFields();
+                yield fields != null ? fields.getName() : "";
+            }
             default -> throw new RuntimeException("Unsupported entity type: " + entityType);
         };
     }