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 9ff6b37a855..7ff4d5a2a47 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
@@ -184,8 +184,6 @@ public class HttpChannelState
                 case COMPLETED:
                     return Action.WAIT;
 
-                case ASYNC_WAIT:
-                    LOG.warn("How did I get here?", new Throwable());
                 case ASYNC_WOKEN:
                     if (_asyncRead)
                     {
@@ -219,6 +217,7 @@ public class HttpChannelState
                                 _async=null;
                                 return Action.ASYNC_EXPIRED;
                             case STARTED:
+                                // TODO
                                 if (DEBUG)
                                     LOG.debug("TODO Fix this double dispatch",new IllegalStateException(this
                                             .getStatusString()));
@@ -361,9 +360,17 @@ public class HttpChannelState
                 case ASYNC_IO:
                     dispatch=false;
                     break;
-                default:
+                case ASYNC_WAIT:
+                    _state=State.ASYNC_WOKEN;
                     dispatch=true;
                     break;
+                case ASYNC_WOKEN:
+                    dispatch=false;
+                    break;
+                default:
+                    LOG.warn("async dispatched when complete {}",this);
+                    dispatch=false;
+                    break;
             }
         }
 
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java
index 9b353b1bdb5..c969f949111 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java
@@ -222,7 +222,7 @@ public class SharedBlockingCallback
                 if (_state == IDLE)
                     throw new IllegalStateException("IDLE");
                 if (_state == null)
-                    LOG.warn(new Throwable());
+                    LOG.debug("Blocker not complete",new Throwable());
             }
             finally
             {