diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index ba627f3cab..accc00a171 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -134,31 +134,31 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
             <expiry-address>ExpiryQueue</expiry-address>
             <redelivery-delay>0</redelivery-delay>
 
-            <!-- if max-size-bytes and max-size-messages were both enabled, the system will enter into paging
-                 based on the first attribute to hits the maximum value -->
-            <!-- limit for the address in bytes, -1 means unlimited -->
-            <max-size-bytes>-1</max-size-bytes>
-
-            <!-- limit for the address in messages, -1 means unlimited -->
-            <max-size-messages>-1</max-size-messages>
-
-            <!-- the size of each file on paging. Notice we keep files in memory while they are in use.
-                 Lower this setting if you have too many queues in memory. -->
-            <page-size-bytes>10M</page-size-bytes>
-
-            <!-- limit how many messages are read from paging into the Queue. -->
-            <max-read-page-messages>-1</max-read-page-messages>
-
-            <!-- limit how much memory is read from paging into the Queue. -->
-            <max-read-page-bytes>20M</max-read-page-bytes>
-
             <message-counter-history-day-limit>10</message-counter-history-day-limit>
             <address-full-policy>${full-policy}</address-full-policy>
             <auto-create-queues>${auto-create}</auto-create-queues>
             <auto-create-addresses>${auto-create}</auto-create-addresses>
             <auto-delete-queues>${auto-delete}</auto-delete-queues>
             <auto-delete-addresses>${auto-delete}</auto-delete-addresses>
-         </address-setting>
+
+            <!-- The size of each page file -->
+            <page-size-bytes>10M</page-size-bytes>
+
+            <!-- When we start applying the address-full-policy, e.g paging -->
+            <!-- Both are disabled by default, which means we will use the global-max-size/global-max-messages  -->
+            <max-size-bytes>-1</max-size-bytes>
+            <max-size-messages>-1</max-size-messages>
+
+            <!-- When we read from paging into queues (memory) -->
+
+            <max-read-page-messages>-1</max-read-page-messages>
+            <max-read-page-bytes>20M</max-read-page-bytes>
+
+            <!-- Limit on paging capacity before starting to throw errors -->
+
+            <page-limit-bytes>-1</page-limit-bytes>
+            <page-limit-messages>-1</page-limit-messages>
+          </address-setting>
       </address-settings>
 
       <addresses>