diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
index 9ebbf8b977d..26f0cee22e3 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
@@ -18,6 +18,7 @@
 
 package org.eclipse.jetty.server;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -545,13 +546,19 @@ public class HttpChannelState
                     {
                         if (event.getThrowable()!=null)
                             listener.onError(event);
-                        else
-                            listener.onComplete(event);
                     }
                     catch(Exception e)
                     {
                         LOG.warn(e);
                     }
+                    try
+                    {
+                        listener.onComplete(event);
+                    }
+                    catch (IOException e)
+                    {
+                        LOG.warn(e);
+                    }
                 }
             }