diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
index 2d0c11041..f709e02db 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
@@ -123,11 +123,9 @@ public class ContextFunctionCatalogAutoConfiguration {
 		mcList.add(new StringMessageConverter());
 		mcList.add(new PrimitiveTypesFromStringMessageConverter(conversionService));
 
-		if (!CollectionUtils.isEmpty(mcList)) {
-			messageConverter = new SmartCompositeMessageConverter(mcList);
-			if (functionInvocationHelper instanceof CloudEventsFunctionInvocationHelper) {
-				((CloudEventsFunctionInvocationHelper) functionInvocationHelper).setMessageConverter(messageConverter);
-			}
+		messageConverter = new SmartCompositeMessageConverter(mcList);
+		if (functionInvocationHelper instanceof CloudEventsFunctionInvocationHelper) {
+			((CloudEventsFunctionInvocationHelper) functionInvocationHelper).setMessageConverter(messageConverter);
 		}
 		FunctionProperties functionProperties = context.getBean(FunctionProperties.class);
 		return new BeanFactoryAwareFunctionRegistry(conversionService, messageConverter, jsonMapper, functionProperties, functionInvocationHelper);