diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
index 2a2f7bc888..50099d7782 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
@@ -1638,7 +1638,8 @@ public class DeviceControllerTest extends AbstractControllerTest {
         Assert.assertEquals(deviceName, savedDevice.getName());
         Assert.assertEquals(deviceType, savedDevice.getType());
 
-        Optional<AttributeKvEntry> retrieved = attributesService.find(tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, "attr").get();
+        Optional<AttributeKvEntry> retrieved = await().atMost(5, TimeUnit.SECONDS)
+                .until(() -> attributesService.find(tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, "attr").get(), Optional::isPresent);
         assertThat(retrieved.get().getJsonValue().get()).isEqualTo(deviceAttr);
         assertThat(retrieved.get().getStrValue()).isNotPresent();
     }