diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java
index 11e6a4303..31be851e8 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java
@@ -86,15 +86,12 @@ public class CloudEventsFunctionInvocationHelper implements FunctionInvocationHe
 
 	@Override
 	public Message<?> postProcessResult(Object result, Message<?> input) {
-		Message<?> convertedResult = null;
+		Object convertedResult = result;
 		if (this.messageConverter != null && CLOUD_EVENT_CLASS != null && CLOUD_EVENT_CLASS.isAssignableFrom(result.getClass())) {
 			convertedResult = this.messageConverter.toMessage(result, input.getHeaders());
 		}
-		if (convertedResult == null) {
-			String targetPrefix = CloudEventMessageUtils.determinePrefixToUse(input.getHeaders());
-			convertedResult = this.doPostProcessResult(result, targetPrefix);
-		}
-		return convertedResult;
+		String targetPrefix = CloudEventMessageUtils.determinePrefixToUse(input.getHeaders());
+		return this.doPostProcessResult(convertedResult, targetPrefix);
 	}
 
 	@Override