diff --git a/src/main/java/org/jboss/netty/handler/queue/BufferedWriteHandler.java b/src/main/java/org/jboss/netty/handler/queue/BufferedWriteHandler.java
index 2d5ae5f974..54940e8cbf 100644
--- a/src/main/java/org/jboss/netty/handler/queue/BufferedWriteHandler.java
+++ b/src/main/java/org/jboss/netty/handler/queue/BufferedWriteHandler.java
@@ -254,6 +254,7 @@ public class BufferedWriteHandler extends SimpleChannelHandler implements LifeCy
             final Queue<MessageEvent> queue = getQueue();
             if (consolidateOnFlush) {
                 if (queue.isEmpty()) {
+                    flush.set(false);
                     return;
                 }
 
@@ -283,7 +284,8 @@ public class BufferedWriteHandler extends SimpleChannelHandler implements LifeCy
                     ctx.sendDownstream(e);
                 }
             }
-        }
+           flush.set(false);
+       }
 
         if (acquired && (!channel.isConnected() || channel.isWritable() && !queue.isEmpty())) {
             flush(consolidateOnFlush);