diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java
index 8e77b315e6..1e3f3b1a60 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java
@@ -113,7 +113,7 @@ public class EdqsEntityDataQueryTest extends AbstractContainerTest {
         EntityCountQuery query = new EntityCountQuery(allDeviceFilter);
         await("Waiting for total device count")
                 .atMost(30, TimeUnit.SECONDS)
-                .until(() -> testRestClient.postCountDataQuery(query).equals(97L * 2));
+                .until(() -> testRestClient.postCountDataQuery(query).compareTo(97L * 2) >= 0);
 
         testRestClient.getAndSetUserToken(tenantAdminId);
         await("Waiting for total device count")