diff --git a/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java b/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java
index ef802be984..1fe097bf7b 100644
--- a/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java
@@ -69,7 +69,7 @@ public abstract class ByteToMessageDecoder<O>
         ByteBuf in = ctx.inboundByteBuffer();
 
         boolean decoded = false;
-        for (;;) {
+        while (in.readable()) {
             try {
                 int oldInputLength = in.readableBytes();
                 O o = decode(ctx, in);