diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java
index 6396579c53..9a98f97765 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java
@@ -146,7 +146,7 @@ public class TargetEndpoint implements MessageEndpoint, BeanNameAware {
 	}
 
 	public void afterPropertiesSet() {
-		if (this.target instanceof ChannelRegistryAware) {
+		if (this.target instanceof ChannelRegistryAware && this.channelRegistry != null) {
 			((ChannelRegistryAware) this.target).setChannelRegistry(this.channelRegistry);
 		}
 		if (this.concurrencyPolicy != null && !(this.target instanceof ConcurrentTarget)) {