diff --git a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
index 47ac9e3567..cb5a4d98cf 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
@@ -92,7 +92,7 @@ public class EdgeEventSourcingListener {
     public void handleEvent(DeleteEntityEvent<?> event) {
         EntityType entityType = event.getEntityId().getEntityType();
         try {
-            if (EntityType.EDGE.equals(entityType) || EntityType.TENANT.equals(entityType) || EntityType.TB_RESOURCE.equals(entityType)) {
+            if (EntityType.EDGE.equals(entityType) || EntityType.TENANT.equals(entityType)) {
                 return;
             }
             log.trace("[{}] DeleteEntityEvent called: {}", event.getTenantId(), event);
@@ -179,7 +179,6 @@ public class EdgeEventSourcingListener {
             case TENANT:
                 return !event.getAdded();
             case API_USAGE_STATE:
-            case TB_RESOURCE:
             case EDGE:
                 return false;
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
index fc24ab5324..80d2647078 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
@@ -180,13 +180,18 @@ public class EntityStateSourcingListener {
     @TransactionalEventListener(fallbackExecution = true)
     public void handleEvent(ActionEntityEvent<?> event) {
         log.trace("[{}] ActionEntityEvent called: {}", event.getTenantId(), event);
-        if (ActionType.CREDENTIALS_UPDATED.equals(event.getActionType()) && EntityType.DEVICE.equals(event.getEntityId().getEntityType())
+        if (ActionType.CREDENTIALS_UPDATED.equals(event.getActionType()) &&
+                EntityType.DEVICE.equals(event.getEntityId().getEntityType())
                 && event.getEntity() instanceof DeviceCredentials) {
             tbClusterService.pushMsgToCore(new DeviceCredentialsUpdateNotificationMsg(event.getTenantId(),
                     (DeviceId) event.getEntityId(), (DeviceCredentials) event.getEntity()), null);
         } else if (ActionType.ASSIGNED_TO_TENANT.equals(event.getActionType()) && event.getEntity() instanceof Device) {
+            Device device = (Device) event.getEntity();
             Tenant tenant = JacksonUtil.fromString(event.getBody(), Tenant.class);
-            pushAssignedFromNotification(tenant, event.getTenantId(), (Device) event.getEntity());
+            if (tenant != null) {
+                tbClusterService.onDeviceAssignedToTenant(tenant.getId(), device);
+            }
+            pushAssignedFromNotification(tenant, event.getTenantId(), device);
         }
     }