diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
index aee56652c4..bb866e3e9b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -397,11 +397,6 @@ public class TelemetryController extends BaseController {
                     @Override
                     public void onSuccess(@Nullable Void tmp) {
                         logAttributesUpdated(user, entityId, scope, attributes, null);
-                        if (entityIdSrc.getEntityType().equals(EntityType.DEVICE)) {
-                            DeviceId deviceId = new DeviceId(entityId.getId());
-                            tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onUpdate(
-                                    user.getTenantId(), deviceId, scope, attributes), null);
-                        }
                         result.setResult(new ResponseEntity(HttpStatus.OK));
                     }
 
diff --git a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/AbstractMqttTelemetryIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/AbstractMqttTelemetryIntegrationTest.java
index f96f207834..0fe85fbb88 100644
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/AbstractMqttTelemetryIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/AbstractMqttTelemetryIntegrationTest.java
@@ -109,7 +109,7 @@ public abstract class AbstractMqttTelemetryIntegrationTest extends AbstractContr
         client.setCallback(callback);
         client.connect(options).waitForCompletion(5000);
         client.subscribe("v1/devices/me/attributes", MqttQoS.AT_MOST_ONCE.value());
-        String payload = "{\"key\":\"value\"}";
+        String payload = "{\"key\":\"uniqueValue\"}";
 //        TODO 3.1: we need to acknowledge subscription only after it is processed by device actor and not when the message is pushed to queue.
 //        MqttClient -> SUB REQUEST -> Transport -> Kafka -> Device Actor (subscribed)
 //        MqttClient <- SUB_ACK <- Transport
diff --git a/dao/src/test/resources/sql-test.properties b/dao/src/test/resources/sql-test.properties
index 7b5f82da2a..50d3a3feb3 100644
--- a/dao/src/test/resources/sql-test.properties
+++ b/dao/src/test/resources/sql-test.properties
@@ -37,6 +37,9 @@ service.type=monolith
 #spring.datasource.driverClassName=org.postgresql.Driver
 #spring.datasource.hikari.maximumPoolSize = 50
 
+queue.core.pack-processing-timeout=3000
+queue.rule-engine.pack-processing-timeout=3000
+
 queue.rule-engine.queues[0].name=Main
 queue.rule-engine.queues[0].topic=tb_rule_engine.main
 queue.rule-engine.queues[0].poll-interval=25