diff --git a/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java b/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
index f1c9f69265..6c096cd754 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
@@ -340,7 +340,7 @@ public class MessageBus implements ChannelRegistry, EndpointRegistry, Applicatio
 				}
 				this.registerChannel(outputChannelName, new SimpleChannel());
 			}
-			if (!dme.hasErrorHandler() && this.getErrorChannel() != null) {
+			if (!dme.hasErrorHandler() && this.getErrorChannel() != null && !this.getErrorChannel().equals(channel)) {
 				dme.setErrorHandler(new MessagePublishingErrorHandler(this.getErrorChannel()));
 			}
 		}