diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
index 101e4f0430..42d8ca0163 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
@@ -173,7 +173,11 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
         case READ_CHUNK_FOOTER: {
             String line = readIntoCurrentLine(buffer);
             if (line.trim().length() == 0) {
-                return reset();
+                if (mergeChunks) {
+                    return reset();
+                } else {
+                    reset();
+                }
             } else {
                 checkpoint(State.READ_CHUNK_FOOTER);
                 return null;