diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
index 66e819443..02fb0d2a9 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
@@ -318,7 +318,7 @@ public class StreamListenerAnnotationBeanPostProcessor implements BeanPostProces
 		Collection<StreamListenerResultAdapter> streamListenerResultAdapters = this.applicationContext
 				.getBeansOfType(StreamListenerResultAdapter.class).values();
 		this.binderAwareChannelResolver = this.applicationContext
-				.getBean(DestinationResolver.class);
+				.getBean("binderAwareChannelResolver", DestinationResolver.class);
 		this.messageHandlerMethodFactory = this.applicationContext
 				.getBean(MessageHandlerMethodFactory.class);
 		this.springIntegrationProperties = this.applicationContext