diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index de7b6876d13..6522c2e1a86 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -1091,11 +1091,9 @@ private Map<String, Long> internalCountMessages(final String filterStr, final St
             if (filter == null && groupByProperty == null) {
                result.put(null, getMessageCount());
             } else {
-               final int limit = addressSettingsRepository.getMatch(address).getManagementBrowsePageSize();
-               int count = 0;
                try (LinkedListIterator<MessageReference> iterator = queue.browserIterator()) {
                   try {
-                     while (iterator.hasNext() && count++ < limit) {
+                     while (iterator.hasNext()) {
                         Message message = iterator.next().getMessage();
                         internalComputeMessage(result, filter, groupByProperty, message);
                      }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index 9f115e48a24..00a0205a2fa 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -4818,7 +4818,7 @@ public void testBrowseLimitOnListBrowseAndFilteredCount() throws Exception {
       assertEquals(5, array.size());
 
       // filer could match all
-      assertEquals(5, queueControl.countMessages("AMQSize > 0"));
+      assertEquals(10, queueControl.countMessages("AMQSize > 0"));
 
       session.deleteQueue(queue);
    }