diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferInputStream.java b/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferInputStream.java
index 094a1a70db01d..1266d4b8c7385 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferInputStream.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferInputStream.java
@@ -37,6 +37,9 @@ public int read() {
     }
 
     public int read(byte[] bytes, int off, int len) {
+        if (len == 0) {
+            return 0;
+        }
         if (!buffer.hasRemaining()) {
             return -1;
         }