diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandler.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandler.java
index 3cb2ecb51..b3862ee51 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandler.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandler.java
@@ -58,23 +58,10 @@ public class SpringBootApiGatewayRequestHandler extends
 
 	@Override
 	protected Object convertEvent(APIGatewayProxyRequestEvent event) {
-
-		if (event.getBody() != null) {
-			if (functionAcceptsMessage()) {
-				return new GenericMessage<>(deserializeBody(event.getBody()), getHeaders(event));
-			}
-			else {
-				return deserializeBody(event.getBody());
-			}
-		}
-		else {
-			if (functionAcceptsMessage()) {
-				return new GenericMessage<Optional<Void>>(Optional.empty(), getHeaders(event));
-			}
-			else {
-				return Optional.empty();
-			}
-		}
+		Object deserializedBody = event.getBody() != null ? deserializeBody(event.getBody()) : Optional.empty();
+		return functionAcceptsMessage()
+				? new GenericMessage<>(deserializedBody, getHeaders(event))
+						: deserializedBody;
 	}
 
 	private boolean functionAcceptsMessage() {