diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java
index 4e05e1d62b..3d006f2c99 100644
--- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java
+++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java
@@ -47,12 +47,8 @@ public class ByteBufferEncoder extends AbstractEncoder<ByteBuffer> {
 	public Flux<DataBuffer> encode(Publisher<? extends ByteBuffer> inputStream,
 			DataBufferAllocator allocator, ResolvableType type, MimeType mimeType,
 			Object... hints) {
-		//noinspection unchecked
-		return Flux.from(inputStream).map(byteBuffer -> {
-			DataBuffer dataBuffer = allocator.allocateBuffer(byteBuffer.remaining());
-			dataBuffer.write(byteBuffer);
-			return dataBuffer;
-		});
+
+		return Flux.from(inputStream).map(allocator::wrap);
 	}
 
 }
\ No newline at end of file