diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
index b47ec0fca2..848f3cb310 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
@@ -326,8 +326,13 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
 			}
 			catch (Throwable ex) {
 				if (logger.isErrorEnabled()) {
-					logger.error("Failed to send client message to application via MessageChannel" +
-							" in session " + session.getId() + ". Sending STOMP ERROR to client.", ex);
+					String errorText = "Failed to send message to MessageChannel in session " + session.getId();
+					if (logger.isDebugEnabled()) {
+						logger.debug(errorText, ex);
+					}
+					else {
+						logger.error(errorText + ":" + ex.getMessage());
+					}
 				}
 				handleError(session, ex, message);
 			}