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 529d00141a..1662797414 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
@@ -138,7 +138,8 @@ public class MethodParameterMessageMapper implements InboundMessageMapper<Object
 					args[i] = message.getHeaders();					
 				}
 			}
-			else if (expectedType.isAssignableFrom(message.getClass())) {
+			else if (expectedType.isAssignableFrom(message.getClass())
+					&& Message.class.isAssignableFrom(expectedType)) {
 				args[i] = message;
 			}
 			else {