diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
index bff5cdb2a..9733b2a01 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
@@ -842,7 +842,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 					}
 					else if (!FunctionTypeUtils.isMessage(type)) {
 						if (this.payloadIsSpecialType(((Message<?>) value).getPayload())) {
-							return ((Message<?>) value).getPayload();
+							return FunctionTypeUtils.isMessage(type) ? value : null;
 						}
 						if (!((Message<?>) convertedValue).getHeaders().containsKey("scf-sink-url")) {
 							convertedValue = ((Message<?>) convertedValue).getPayload();