diff --git a/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java b/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
index 58b07f122e..3154f71ab5 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
@@ -280,7 +280,8 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
     private void processEntity(TenantId tenantId, TransportProtos.EdgeNotificationMsgProto edgeNotificationMsg) {
         ActionType edgeEventActionType = ActionType.valueOf(edgeNotificationMsg.getEdgeEventAction());
         EdgeEventType edgeEventType = EdgeEventType.valueOf(edgeNotificationMsg.getEdgeEventType());
-        EntityId entityId = EntityIdFactory.getByEdgeEventTypeAndUuid(edgeEventType, new UUID(edgeNotificationMsg.getEntityIdMSB(), edgeNotificationMsg.getEntityIdLSB()));
+        EntityId entityId = EntityIdFactory.getByEdgeEventTypeAndUuid(edgeEventType,
+                new UUID(edgeNotificationMsg.getEntityIdMSB(), edgeNotificationMsg.getEntityIdLSB()));
         ListenableFuture<List<EdgeId>> edgeIdsFuture;
         switch (edgeEventActionType) {
             case ADDED: // used only for USER entity
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 a484821890..b7562aea84 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
@@ -432,7 +432,8 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
                 ListenableFuture<List<EntityRelation>> originatorEdgeRelationsFuture =
                         relationService.findByToAndTypeAsync(tenantId, entityId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE);
                 return Futures.transform(originatorEdgeRelationsFuture, originatorEdgeRelations -> {
-                    if (originatorEdgeRelations != null && originatorEdgeRelations.size() > 0) {
+                    if (originatorEdgeRelations != null && originatorEdgeRelations.size() > 0 &&
+                            originatorEdgeRelations.get(0).getFrom() != null) {
                         return Collections.singletonList(new EdgeId(originatorEdgeRelations.get(0).getFrom().getId()));
                     } else {
                         return Collections.emptyList();
@@ -444,6 +445,9 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
                 return convertToEdgeIds(findEdgesByTenantIdAndRuleChainId(tenantId, new RuleChainId(entityId.getId())));
             case USER:
                 User userById = userService.findUserById(tenantId, new UserId(entityId.getId()));
+                if (userById == null) {
+                    return Futures.immediateFuture(Collections.emptyList());
+                }
                 TextPageData<Edge> edges;
                 if (userById.getCustomerId() == null || userById.getCustomerId().isNullUid()) {
                     edges = findEdgesByTenantId(tenantId, new TextPageLink(Integer.MAX_VALUE));