diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java
index 3f8398a49..b7796ac16 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -246,7 +247,8 @@ public class BindingServiceConfiguration {
 	@ConditionalOnMissingBean
 	public org.springframework.cloud.stream.binding.BinderAwareRouterBeanPostProcessor binderAwareRouterBeanPostProcessor(
 			@Autowired(required = false) AbstractMappingMessageRouter[] routers,
-			@Autowired(required = false) DestinationResolver<MessageChannel> channelResolver) {
+			@Autowired(required = false) @Qualifier("binderAwareChannelResolver")
+				DestinationResolver<MessageChannel> channelResolver) {
 
 		return new org.springframework.cloud.stream.binding.BinderAwareRouterBeanPostProcessor(
 				routers, channelResolver);