diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java
index dd578b006d..2e1594689c 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java
@@ -135,6 +135,12 @@ public abstract class HttpContentDecoder extends MessageToMessageDecoder<HttpObj
                     return new Object[] { header,  new DefaultHttpContent(newContent),
                             new DefaultLastHttpContent(lastProduct)};
                 }
+            } else {
+                if (header == null) {
+                    return new Object[] { new DefaultLastHttpContent(newContent) };
+                } else {
+                    return new Object[] { header, new DefaultLastHttpContent(newContent) };
+                }
             }
         }
         if (header == null) {
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
index ecab6b5e94..2c093966d5 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
@@ -187,6 +187,12 @@ public abstract class HttpContentEncoder extends MessageToMessageCodec<HttpMessa
                     return new Object[] { header,  new DefaultHttpContent(newContent),
                             new DefaultLastHttpContent(lastProduct)};
                 }
+            } else {
+                if (header == null) {
+                    return new Object[] { new DefaultLastHttpContent(newContent) };
+                } else {
+                    return new Object[] { header, new DefaultLastHttpContent(newContent) };
+                }
             }
         }
         if (header == null) {