diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
index 14a2cbb288..a85ff5690b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
@@ -214,9 +214,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
 	}
 
 	public void registerEndpoint(MessageEndpoint endpoint) {
-		if (endpoint instanceof ChannelRegistryAware) {
-			((ChannelRegistryAware) endpoint).setChannelRegistry(this);
-		}
 		this.endpointRegistry.registerEndpoint(endpoint);
 		if (this.isRunning()) {
 			this.activateEndpoint(endpoint);