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 02fb0d2a9..08a3dcb0f 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
@@ -320,7 +320,7 @@ public class StreamListenerAnnotationBeanPostProcessor implements BeanPostProces
 		this.binderAwareChannelResolver = this.applicationContext
 				.getBean("binderAwareChannelResolver", DestinationResolver.class);
 		this.messageHandlerMethodFactory = this.applicationContext
-				.getBean(MessageHandlerMethodFactory.class);
+				.getBean("integrationMessageHandlerMethodFactory", MessageHandlerMethodFactory.class);
 		this.springIntegrationProperties = this.applicationContext
 				.getBean(SpringIntegrationProperties.class);