diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
index 8a3d3bb4db..e0a86aa85d 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
@@ -221,7 +221,6 @@ public class ChunkedWriteHandler implements ChannelUpstreamHandler, ChannelDowns
                                 throws Exception {
                             if (!future.isSuccess()) {
                                 currentEvent.getFuture().setFailure(future.getCause());
-                                ((ChunkedInput) currentEvent.getMessage()).close();
                             }
                         }
                     });
@@ -234,6 +233,11 @@ public class ChunkedWriteHandler implements ChannelUpstreamHandler, ChannelDowns
                 ctx.sendDownstream(currentEvent);
                 currentEvent = null;
             }
+
+            if (!channel.isConnected()) {
+                discard(ctx);
+                break;
+            }
         }
     }
 }