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 65c3d9cca..33c297c6b 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
@@ -278,10 +278,8 @@ public class StreamListenerAnnotationBeanPostProcessor
 						break;
 					}
 				}
-				if (arguments[parameterIndex] == null) {
-					if (parameterType.isAssignableFrom(targetBean.getClass())) {
-						arguments[parameterIndex] = targetBean;
-					}
+				if (arguments[parameterIndex] == null && parameterType.isAssignableFrom(targetBean.getClass())) {
+					arguments[parameterIndex] = targetBean;
 				}
 				Assert.notNull(arguments[parameterIndex], "Cannot convert argument " + parameterIndex + " of " + method
 						+ "from " + targetBean.getClass() + " to " + parameterType);