diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
index dd5ce016e..d33fab87d 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
@@ -40,6 +40,9 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
 		if (input instanceof Message) {
 			return this.doApply((Message<byte[]>) input, targetFunction);
 		}
+		else if (targetFunction.isSupplier()) {
+			return this.doApply(null, targetFunction);
+		}
 		return targetFunction.apply(input);
 	}