diff --git a/exist-core/src/main/java/org/exist/storage/NotificationService.java b/exist-core/src/main/java/org/exist/storage/NotificationService.java
index a2f7ef4498..0ff1ac8cc5 100644
--- a/exist-core/src/main/java/org/exist/storage/NotificationService.java
+++ b/exist-core/src/main/java/org/exist/storage/NotificationService.java
@@ -104,7 +104,10 @@ public synchronized void debug() {
     @Override
     public void shutdown() {
         synchronized (this) {
-            LOG.warn("Expected 0 listeners at shutdown, but {} listeners are still registered", listeners.size());
+            final int remainingListeners = listeners.size();
+            if (remainingListeners > 0) {
+                LOG.warn("Expected 0 listeners at shutdown, but {} listeners are still registered", remainingListeners);
+            }
         }
         BrokerPoolService.super.shutdown();
     }