diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
index c45a8ae9492..d921fbcfff0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
@@ -139,12 +139,14 @@ public long scaleDownMessages(ClientSessionFactory sessionFactory,
             }
 
             String sfPrefix =  ((PostOfficeImpl) postOffice).getServer().getInternalNamingPrefix() + "sf.";
+            long messageCountItem = 0;
             if (address.toString().startsWith(sfPrefix)) {
-               messageCount += scaleDownSNF(address, queues, producer);
+               messageCountItem += scaleDownSNF(address, queues, producer);
             } else {
-               messageCount += scaleDownRegularMessages(address, queues, session, producer);
+               messageCountItem += scaleDownRegularMessages(address, queues, session, producer);
             }
-
+            logger.debug("Scaled down {} messages on address {}", messageCountItem, address);
+            messageCount += messageCountItem;
          }
       }