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 49ff7454a..92a364dad 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,7 +40,8 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
 		String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled");
 		boolean functionalTracingEnabled = StringUtils.hasText(functionalTracingEnabledStr)
 				? Boolean.parseBoolean(functionalTracingEnabledStr) : true;
-		if (functionalTracingEnabled) {
+		if (functionalTracingEnabled && !targetFunction.isInputTypePublisher() &&
+				input instanceof Message && !FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType())) {
 			boolean isSkipOutputConversion = targetFunction.isSkipOutputConversion();
 			targetFunction.setSkipOutputConversion(true);
 			try {