diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
index 1efbb8bfb..295e984e3 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
@@ -315,11 +315,17 @@ public class FunctionConfiguration {
 
 		@Override
 		public Object apply(Object input) {
+			if (this.outputMessageEnricher == null) {// to avoid breaking change
+				return this.function.apply(input);
+			}
 			return this.function.apply(input, this.outputMessageEnricher);
 		}
 
 		@Override
 		public Object get() {
+			if (this.outputMessageEnricher == null) {// to avoid breaking change
+				return this.function.get();
+			}
 			return this.function.get(this.outputMessageEnricher);
 		}
 	}