diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java
index cf97b7959b..529d00141a 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java
@@ -240,9 +240,9 @@ public class MethodParameterMessageMapper implements InboundMessageMapper<Object
 				if (Headers.class.isInstance(o)) {
 					Assert.isAssignable(Map.class, this.getParameterType(),
 							"parameter with the @Headers annotation must be assignable to java.util.Map");
+					this._hasHeadersAnnotation = true;
+					return true;
 				}
-				this._hasHeadersAnnotation = true;
-				return true;
 			}
 			return false;
 		}