diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
index ee34bd7f23..9532bc3044 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
@@ -561,7 +561,7 @@ public class DefaultDataUpdateService implements DataUpdateService {
         while (hasNext) {
             for (Alarm alarm : alarms.getData()) {
                 if (alarm.getCustomerId() == null && alarm.getOriginator() != null) {
-                    alarm.setCustomerId(entityService.fetchEntityCustomerId(tenantId, alarm.getOriginator()));
+                    alarm.setCustomerId(entityService.fetchEntityCustomerId(tenantId, alarm.getOriginator()).get());
                     alarmDao.save(tenantId, alarm);
                 }
                 if (processed.incrementAndGet() % 1000 == 0) {
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java
index 9362dbef7a..aa5c70867f 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java
@@ -29,7 +29,7 @@ public interface EntityService {
 
     Optional<String> fetchEntityName(TenantId tenantId, EntityId entityId);
 
-    CustomerId fetchEntityCustomerId(TenantId tenantId, EntityId entityId);
+    Optional<CustomerId> fetchEntityCustomerId(TenantId tenantId, EntityId entityId);
 
     long countEntitiesByQuery(TenantId tenantId, CustomerId customerId, EntityCountQuery query);
 
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/TbEntityService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/TbEntityService.java
index bbea98179b..0ce6a75b80 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/TbEntityService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/TbEntityService.java
@@ -15,23 +15,14 @@
  */
 package org.thingsboard.server.dao.entity;
 
-import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.TenantId;
 
 import java.util.Optional;
 
-import static org.thingsboard.server.common.data.id.EntityId.NULL_UUID;
-
 public interface TbEntityService {
 
-    CustomerId NULL_CUSTOMER_ID = new CustomerId(NULL_UUID);
-
     Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId);
 
-    default CustomerId getCustomerId(TenantId tenantId, EntityId entityId) {
-        return NULL_CUSTOMER_ID;
-    }
-
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
index bf41420f40..f73ee2b9e1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
@@ -49,7 +49,6 @@ import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.entity.EntityService;
-import org.thingsboard.server.dao.entity.TbEntityService;
 import org.thingsboard.server.dao.service.DataValidator;
 
 import javax.annotation.Nullable;
@@ -115,7 +114,7 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
             if (alarm.getEndTs() == 0L) {
                 alarm.setEndTs(alarm.getStartTs());
             }
-            alarm.setCustomerId(entityService.fetchEntityCustomerId(alarm.getTenantId(), alarm.getOriginator()));
+            alarm.setCustomerId(entityService.fetchEntityCustomerId(alarm.getTenantId(), alarm.getOriginator()).get());
             if (alarm.getId() == null) {
                 Alarm existing = alarmDao.findLatestByOriginatorAndType(alarm.getTenantId(), alarm.getOriginator(), alarm.getType());
                 if (existing == null || existing.getStatus().isCleared()) {
@@ -407,16 +406,7 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findAlarmById(tenantId, new AlarmId(entityId.getId())));
+        return Optional.ofNullable(findAlarmById(tenantId, new AlarmId(entityId.getId())));
     }
 
-    @Override
-    public CustomerId getCustomerId(TenantId tenantId, EntityId entityId) {
-        try {
-            Alarm alarm = findAlarmByIdAsync(tenantId, new AlarmId(entityId.getId())).get();
-            return alarm != null ? alarm.getCustomerId() : TbEntityService.NULL_CUSTOMER_ID;
-        } catch (Exception e) {
-            return TbEntityService.NULL_CUSTOMER_ID;
-        }
-    }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
index f0abff89c4..75de5ba5d0 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
@@ -269,7 +269,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findAssetProfileById(tenantId, new AssetProfileId(entityId.getId())));
+        return Optional.ofNullable(findAssetProfileById(tenantId, new AssetProfileId(entityId.getId())));
     }
 
     private PaginatedRemover<TenantId, AssetProfile> tenantAssetProfilesRemover =
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
index 6f24f5a5eb..e65a886833 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
@@ -46,7 +46,6 @@ import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
-import org.thingsboard.server.dao.entity.TbEntityService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
@@ -435,13 +434,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findAssetById(tenantId, new AssetId(entityId.getId())));
-    }
-
-    @Override
-    public CustomerId getCustomerId(TenantId tenantId, EntityId entityId) {
-        Asset asset = findAssetById(tenantId, new AssetId(entityId.getId()));
-        return asset != null ? asset.getCustomerId() : TbEntityService.NULL_CUSTOMER_ID;
+        return Optional.ofNullable(findAssetById(tenantId, new AssetId(entityId.getId())));
     }
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
index f9b602031d..aad5de33f7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
@@ -183,11 +183,7 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findCustomerById(tenantId, new CustomerId(entityId.getId())));
+        return Optional.ofNullable(findCustomerById(tenantId, new CustomerId(entityId.getId())));
     }
 
-    @Override
-    public CustomerId getCustomerId(TenantId tenantId, EntityId entityId) {
-        return new CustomerId(entityId.getId());
-    }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
index d9649a8f79..d40c559856 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
@@ -312,7 +312,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findDashboardById(tenantId, new DashboardId(entityId.getId())));
+        return Optional.ofNullable(findDashboardById(tenantId, new DashboardId(entityId.getId())));
     }
 
     private class CustomerDashboardsUnassigner extends PaginatedRemover<Customer, DashboardInfo> {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
index ee43e6152b..e459d3f48d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
@@ -291,7 +291,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findDeviceProfileById(tenantId, new DeviceProfileId(entityId.getId())));
+        return Optional.ofNullable(findDeviceProfileById(tenantId, new DeviceProfileId(entityId.getId())));
     }
 
     private PaginatedRemover<TenantId, DeviceProfile> tenantDeviceProfilesRemover =
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
index 66a58b02b1..d095e3d96c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
@@ -67,7 +67,6 @@ import org.thingsboard.server.dao.device.provision.ProvisionFailedException;
 import org.thingsboard.server.dao.device.provision.ProvisionRequest;
 import org.thingsboard.server.dao.device.provision.ProvisionResponseStatus;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
-import org.thingsboard.server.dao.entity.TbEntityService;
 import org.thingsboard.server.dao.event.EventService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.DataValidator;
@@ -711,12 +710,7 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findDeviceById(tenantId, new DeviceId(entityId.getId())));
+        return Optional.ofNullable(findDeviceById(tenantId, new DeviceId(entityId.getId())));
     }
 
-    @Override
-    public CustomerId getCustomerId(TenantId tenantId, EntityId entityId) {
-        Device device = findDeviceById(tenantId, new DeviceId(entityId.getId()));
-        return device != null ? device.getCustomerId() : TbEntityService.NULL_CUSTOMER_ID;
-    }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
index 94b6926760..68763786ef 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
@@ -53,7 +53,6 @@ import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
-import org.thingsboard.server.dao.entity.TbEntityService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.rule.RuleChainService;
@@ -524,12 +523,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findEdgeById(tenantId, new EdgeId(entityId.getId())));
+        return Optional.ofNullable(findEdgeById(tenantId, new EdgeId(entityId.getId())));
     }
 
-    @Override
-    public CustomerId getCustomerId(TenantId tenantId, EntityId entityId) {
-        Edge edge = findEdgeById(tenantId, new EdgeId(entityId.getId()));
-        return edge != null ? edge.getCustomerId() : TbEntityService.NULL_CUSTOMER_ID;
-    }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
index b224a05b33..688d3cef7a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.thingsboard.server.common.data.HasCustomerId;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -35,6 +36,7 @@ import org.thingsboard.server.dao.exception.IncorrectParameterException;
 
 import java.util.Optional;
 
+import static org.thingsboard.server.common.data.id.EntityId.NULL_UUID;
 import static org.thingsboard.server.dao.service.Validator.validateId;
 
 /**
@@ -46,6 +48,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
 
     public static final String INCORRECT_TENANT_ID = "Incorrect tenantId ";
     public static final String INCORRECT_CUSTOMER_ID = "Incorrect customerId ";
+    public static final CustomerId NULL_CUSTOMER_ID = new CustomerId(NULL_UUID);
 
     @Autowired
     private EntityQueryDao entityQueryDao;
@@ -80,17 +83,25 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
             HasId<?> hasId = hasIdOpt.get();
             if (hasId instanceof HasName) {
                 HasName hasName = (HasName) hasId;
-                return Optional.of(hasName.getName());
+                return Optional.ofNullable(hasName.getName());
             }
         }
         return Optional.empty();
     }
 
     @Override
-    public CustomerId fetchEntityCustomerId(TenantId tenantId, EntityId entityId) {
+    public Optional<CustomerId> fetchEntityCustomerId(TenantId tenantId, EntityId entityId) {
         log.trace("Executing fetchEntityCustomerId [{}]", entityId);
         TbEntityService tbEntityService = entityServiceBeanFactory.getServiceByEntityType(entityId.getEntityType());
-        return tbEntityService.getCustomerId(tenantId, entityId);
+        Optional<HasId<?>> hasIdOpt = tbEntityService.fetchEntity(tenantId, entityId);
+        if (hasIdOpt.isPresent()) {
+            HasId<?> hasId = hasIdOpt.get();
+            if (hasId instanceof HasCustomerId) {
+                HasCustomerId hasCustomerId = (HasCustomerId) hasId;
+                return Optional.ofNullable(hasCustomerId.getCustomerId());
+            }
+        }
+        return Optional.of(NULL_CUSTOMER_ID);
     }
 
     private static void validateEntityCountQuery(EntityCountQuery query) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
index 042aa62152..f828be9235 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
@@ -43,7 +43,6 @@ import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
-import org.thingsboard.server.dao.entity.TbEntityService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
@@ -414,12 +413,7 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findEntityViewById(tenantId, new EntityViewId(entityId.getId())));
+        return Optional.ofNullable(findEntityViewById(tenantId, new EntityViewId(entityId.getId())));
     }
 
-    @Override
-    public CustomerId getCustomerId(TenantId tenantId, EntityId entityId) {
-        EntityView entityView = findEntityViewById(tenantId, new EntityViewId(entityId.getId()));
-        return entityView != null ? entityView.getCustomerId() : TbEntityService.NULL_CUSTOMER_ID;
-    }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java b/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
index c6f34035a7..0345ed2369 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
@@ -238,7 +238,7 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findOtaPackageInfoById(tenantId, new OtaPackageId(entityId.getId())));
+        return Optional.ofNullable(findOtaPackageInfoById(tenantId, new OtaPackageId(entityId.getId())));
     }
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
index 93fa0bbac8..a05eb12218 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
@@ -124,7 +124,7 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findQueueById(tenantId, new QueueId(entityId.getId())));
+        return Optional.ofNullable(findQueueById(tenantId, new QueueId(entityId.getId())));
     }
 
     private PaginatedRemover<TenantId, Queue> tenantQueuesRemover =
diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
index 8c38ee249e..9d72a331de 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
@@ -138,7 +138,7 @@ public class BaseResourceService implements ResourceService {
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findResourceInfoById(tenantId, new TbResourceId(entityId.getId())));
+        return Optional.ofNullable(findResourceInfoById(tenantId, new TbResourceId(entityId.getId())));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java b/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
index b8857f5537..e56fd832ec 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
@@ -99,7 +99,7 @@ public class BaseRpcService implements RpcService {
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findById(tenantId, new RpcId(entityId.getId())));
+        return Optional.ofNullable(findById(tenantId, new RpcId(entityId.getId())));
     }
 
     private PaginatedRemover<TenantId, Rpc> tenantRpcRemover =
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
index 7837660ee4..d6b9e123fb 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
@@ -762,9 +762,10 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return EntityType.RULE_NODE.equals(entityId.getEntityType()) ?
-                Optional.of(findRuleNodeById(tenantId, new RuleNodeId(entityId.getId()))) :
-                Optional.of(findRuleChainById(tenantId, new RuleChainId(entityId.getId())));
+        HasId<?> hasId = EntityType.RULE_NODE.equals(entityId.getEntityType()) ?
+                findRuleNodeById(tenantId, new RuleNodeId(entityId.getId())) :
+                findRuleChainById(tenantId, new RuleChainId(entityId.getId()));
+        return Optional.ofNullable(hasId);
     }
 
     private List<EntityRelation> getRuleChainToNodeRelations(TenantId tenantId, RuleChainId ruleChainId) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
index fc28d461e2..03479e4483 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
@@ -209,7 +209,7 @@ public class TenantProfileServiceImpl extends AbstractCachedEntityService<Tenant
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findTenantProfileById(tenantId, new TenantProfileId(entityId.getId())));
+        return Optional.ofNullable(findTenantProfileById(tenantId, new TenantProfileId(entityId.getId())));
     }
 
     private final PaginatedRemover<String, TenantProfile> tenantProfilesRemover =
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
index c849199e74..04f42ed3e2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
@@ -262,6 +262,6 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findTenantById(new TenantId(entityId.getId())));
+        return Optional.ofNullable(findTenantById(new TenantId(entityId.getId())));
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
index f5c586acec..4c6a3472ee 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
@@ -165,6 +165,6 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findApiUsageStateById(tenantId, new ApiUsageStateId(entityId.getId())));
+        return Optional.ofNullable(findApiUsageStateById(tenantId, new ApiUsageStateId(entityId.getId())));
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
index 2e231eeb23..28912d3571 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
@@ -41,7 +41,6 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.security.event.UserCredentialsInvalidationEvent;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
-import org.thingsboard.server.dao.entity.TbEntityService;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
@@ -403,13 +402,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findUserById(tenantId, new UserId(entityId.getId())));
-    }
-
-    @Override
-    public CustomerId getCustomerId(TenantId tenantId, EntityId entityId) {
-        User user = findUserById(tenantId, new UserId(entityId.getId()));
-        return user != null ? user.getCustomerId() : TbEntityService.NULL_CUSTOMER_ID;
+        return Optional.ofNullable(findUserById(tenantId, new UserId(entityId.getId())));
     }
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
index b1aa3c4db4..e5e9360698 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
@@ -117,7 +117,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        findWidgetTypeById(tenantId, new WidgetTypeId(entityId.getId()));
-        return Optional.of(findWidgetTypeById(tenantId, new WidgetTypeId(entityId.getId())));
+        return Optional.ofNullable(findWidgetTypeById(tenantId, new WidgetTypeId(entityId.getId())));
     }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
index d745cf22d2..474ac247ba 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
@@ -156,7 +156,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
 
     @Override
     public Optional<HasId<?>> fetchEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.of(findWidgetsBundleById(tenantId, new WidgetsBundleId(entityId.getId())));
+        return Optional.ofNullable(findWidgetsBundleById(tenantId, new WidgetsBundleId(entityId.getId())));
     }
 
     private PaginatedRemover<TenantId, WidgetsBundle> tenantWidgetsBundleRemover =