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;
         }
diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java
new file mode 100644
index 0000000000000..f41c1056bd707
--- /dev/null
+++ b/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.kafka.common.utils;
+
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+
+import static org.junit.Assert.assertEquals;
+
+public class ByteBufferInputStreamTest {
+
+    @Test
+    public void testReadUnsignedIntFromInputStream() {
+        ByteBuffer buffer = ByteBuffer.allocate(8);
+        buffer.put((byte) 10);
+        buffer.put((byte) 20);
+        buffer.put((byte) 30);
+        buffer.rewind();
+
+        byte[] b = new byte[6];
+
+        ByteBufferInputStream inputStream = new ByteBufferInputStream(buffer);
+        assertEquals(10, inputStream.read());
+        assertEquals(20, inputStream.read());
+
+        assertEquals(3, inputStream.read(b, 3, b.length - 3));
+        assertEquals(0, inputStream.read());
+
+        assertEquals(2, inputStream.read(b, 0, b.length));
+        assertEquals(-1, inputStream.read(b, 0, b.length));
+        assertEquals(0, inputStream.read(b, 0, 0));
+        assertEquals(-1, inputStream.read());
+    }
+}
\ No newline at end of file