diff --git a/src/main/kotlin/com/rogervinas/stream/functional/MyConfiguration.kt b/src/main/kotlin/com/rogervinas/stream/functional/MyConfiguration.kt
index 2f159e2..0e5281c 100644
--- a/src/main/kotlin/com/rogervinas/stream/functional/MyConfiguration.kt
+++ b/src/main/kotlin/com/rogervinas/stream/functional/MyConfiguration.kt
@@ -1,13 +1,17 @@
 package com.rogervinas.stream.functional
 
+import com.fasterxml.jackson.databind.ObjectMapper
 import com.rogervinas.stream.domain.MyEvent
 import com.rogervinas.stream.domain.MyEventConsumer
 import com.rogervinas.stream.shared.MyEventPayload
+import org.springframework.cloud.function.json.JacksonMapper
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Primary
 import org.springframework.messaging.Message
 import reactor.core.publisher.Flux
 
+
 @Configuration
 class MyConfiguration {
   @Bean
@@ -27,4 +31,11 @@ class MyConfiguration {
 
   @Bean("my-producer")
   fun myStreamEventProducerFunction(producer: MyStreamEventProducer): () -> Flux<Message<MyEventPayload>> = producer
+
+  @Bean
+  @Primary
+  fun jacksonMapper(objectMapper: ObjectMapper): JacksonMapper {
+    // Workaround for https://github.com/spring-cloud/spring-cloud-function/issues/1158
+    return JacksonMapper(objectMapper)
+  }
 }