diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactory.java
index 2830c0e1..e39aff17 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactory.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/rewrite/ModifyResponseBodyGatewayFilterFactory.java
@@ -342,8 +342,11 @@ public class ModifyResponseBodyGatewayFilterFactory extends
 				MessageBodyEncoder encoder = messageBodyEncoders.get(encoding);
 				if (encoder != null) {
 					DataBufferFactory dataBufferFactory = httpResponse.bufferFactory();
-					response = response.publishOn(Schedulers.parallel())
-							.map(encoder::encode).map(dataBufferFactory::wrap);
+					response = response.publishOn(Schedulers.parallel()).map(buffer -> {
+						byte[] encodedResponse = encoder.encode(buffer);
+						DataBufferUtils.release(buffer);
+						return encodedResponse;
+					}).map(dataBufferFactory::wrap);
 					break;
 				}
 			}