diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java
index d8cb538ff5..cfd2642c1d 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java
@@ -34,7 +34,7 @@ public class SimpleMessageMapper implements InboundMessageMapper<Object>, Outbou
 	 * Returns the Message payload (or null if the Message is null).
 	 */
 	public Object fromMessage(Message<?> message) {
-		if (message == null || message.getPayload() == null) {
+		if (message == null) {
 			return null;
 		}
 		return message.getPayload();