diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
index 425f9a04c2..47f1fc0753 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -390,8 +390,11 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler
 			if (sessionId == null || sessionId == SystemStompConnectionHandler.SESSION_ID) {
 				throw new MessageDeliveryException("Message broker is not active.");
 			}
-			if (logger.isDebugEnabled()) {
-				logger.debug("Message broker is not active. Ignoring message id=" + message.getHeaders().getId());
+			if (SimpMessageType.CONNECT.equals(headers.getMessageType()) && logger.isErrorEnabled()) {
+				logger.error("Message broker is not active. Ignoring: " + message);
+			}
+			else if (logger.isDebugEnabled()) {
+				logger.debug("Message broker is not active. Ignoring: " + message);
 			}
 			return;
 		}