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 7bafd53644..dc3d1a74f7 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
@@ -112,7 +112,7 @@ public class EdgeEventSourcingListener {
             return;
         }
         try {
-            if (EntityType.TENANT.equals(entityType) || EntityType.EDGE.equals(entityType)) {
+            if (EntityType.TENANT == entityType || EntityType.EDGE == entityType || EntityType.AI_SETTINGS == entityType) {
                 return;
             }
             log.trace("[{}] DeleteEntityEvent called: {}", tenantId, event);
@@ -226,7 +226,7 @@ public class EdgeEventSourcingListener {
                     break;
                 case TENANT:
                     return !event.getCreated();
-                case API_USAGE_STATE, EDGE:
+                case API_USAGE_STATE, EDGE, AI_SETTINGS:
                     return false;
                 case DOMAIN:
                     if (entity instanceof Domain domain) {
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/RelatedEdgesSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/edge/RelatedEdgesSourcingListener.java
index 61405e17e1..e0c24a13bc 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/RelatedEdgesSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/RelatedEdgesSourcingListener.java
@@ -58,8 +58,7 @@ public class RelatedEdgesSourcingListener {
             log.trace("[{}] ActionEntityEvent called: {}", event.getTenantId(), event);
             try {
                 switch (event.getActionType()) {
-                    case ASSIGNED_TO_EDGE, UNASSIGNED_FROM_EDGE ->
-                            relatedEdgesService.publishRelatedEdgeIdsEvictEvent(event.getTenantId(), event.getEntityId());
+                    case ASSIGNED_TO_EDGE, UNASSIGNED_FROM_EDGE -> relatedEdgesService.publishRelatedEdgeIdsEvictEvent(event.getTenantId(), event.getEntityId());
                 }
             } catch (Exception e) {
                 log.error("[{}] failed to process ActionEntityEvent: {}", event.getTenantId(), event, e);
@@ -67,7 +66,10 @@ public class RelatedEdgesSourcingListener {
         });
     }
 
-    @TransactionalEventListener(fallbackExecution = true)
+    @TransactionalEventListener(
+            fallbackExecution = true,
+            condition = "#event.entityId.getEntityType() != T(org.thingsboard.server.common.data.EntityType).AI_SETTINGS"
+    )
     public void handleEvent(DeleteEntityEvent<?> event) {
         executorService.submit(() -> {
             log.trace("[{}] DeleteEntityEvent called: {}", event.getTenantId(), event);
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 648e89adc9..d0d9376f12 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
@@ -96,7 +96,7 @@ public class EntityStateSourcingListener {
             case ASSET -> {
                 onAssetUpdate(event.getEntity(), event.getOldEntity());
             }
-            case ASSET_PROFILE, ENTITY_VIEW, NOTIFICATION_RULE -> {
+            case ASSET_PROFILE, ENTITY_VIEW, NOTIFICATION_RULE, AI_SETTINGS -> {
                 tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, lifecycleEvent);
             }
             case RULE_CHAIN -> {
@@ -158,7 +158,7 @@ public class EntityStateSourcingListener {
                 Asset asset = (Asset) event.getEntity();
                 tbClusterService.onAssetDeleted(tenantId, asset, null);
             }
-            case ASSET_PROFILE, ENTITY_VIEW, CUSTOMER, EDGE, NOTIFICATION_RULE -> {
+            case ASSET_PROFILE, ENTITY_VIEW, CUSTOMER, EDGE, NOTIFICATION_RULE, AI_SETTINGS -> {
                 tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
             }
             case NOTIFICATION_REQUEST -> {
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
index 561dc7122a..aa27b4592b 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
@@ -584,16 +584,18 @@ public class DefaultTbClusterService implements TbClusterService {
         TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> toRuleEngineProducer = producerProvider.getRuleEngineNotificationsMsgProducer();
         Set<String> tbRuleEngineServices = partitionService.getAllServiceIds(ServiceType.TB_RULE_ENGINE);
         EntityType entityType = msg.getEntityId().getEntityType();
-        if (entityType.equals(EntityType.TENANT)
-                || entityType.equals(EntityType.TENANT_PROFILE)
-                || entityType.equals(EntityType.DEVICE_PROFILE)
-                || (entityType.equals(EntityType.ASSET) && msg.getEvent() == ComponentLifecycleEvent.UPDATED)
-                || entityType.equals(EntityType.ASSET_PROFILE)
-                || entityType.equals(EntityType.API_USAGE_STATE)
-                || (entityType.equals(EntityType.DEVICE) && msg.getEvent() == ComponentLifecycleEvent.UPDATED)
-                || entityType.equals(EntityType.ENTITY_VIEW)
-                || entityType.equals(EntityType.NOTIFICATION_RULE)
-                || entityType.equals(EntityType.CALCULATED_FIELD)
+        if (entityType.isOneOf(
+                EntityType.TENANT,
+                EntityType.API_USAGE_STATE,
+                EntityType.ENTITY_VIEW,
+                EntityType.NOTIFICATION_RULE,
+                EntityType.CALCULATED_FIELD,
+                EntityType.AI_SETTINGS,
+                EntityType.TENANT_PROFILE,
+                EntityType.DEVICE_PROFILE,
+                EntityType.ASSET_PROFILE)
+                || (entityType == EntityType.ASSET && msg.getEvent() == ComponentLifecycleEvent.UPDATED)
+                || (entityType == EntityType.DEVICE && msg.getEvent() == ComponentLifecycleEvent.UPDATED)
         ) {
             TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toCoreNfProducer = producerProvider.getTbCoreNotificationsMsgProducer();
             Set<String> tbCoreServices = partitionService.getAllServiceIds(ServiceType.TB_CORE);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java b/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java
index 1ca2973936..703d944e3b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java
@@ -46,7 +46,7 @@ public class CleanUpService {
     private final Set<EntityType> skippedEntities = EnumSet.of(
             EntityType.ALARM, EntityType.QUEUE, EntityType.TB_RESOURCE, EntityType.OTA_PACKAGE,
             EntityType.NOTIFICATION_REQUEST, EntityType.NOTIFICATION_TEMPLATE,
-            EntityType.NOTIFICATION_TARGET, EntityType.NOTIFICATION_RULE
+            EntityType.NOTIFICATION_TARGET, EntityType.NOTIFICATION_RULE, EntityType.AI_SETTINGS
     );
 
     @TransactionalEventListener(fallbackExecution = true) // after transaction commit