diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
index 8dfed18ffb29..ff54addf0b05 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
@@ -1273,8 +1273,15 @@ protected void onCompleteSuccess()
                         break;
 
                     case UNREADY:
-                        _state = _last ? State.CLOSED : State.READY;
-                        close = true;
+                        if (_last)
+                        {
+                            _state = State.CLOSED;
+                            close = true;
+                        }
+                        else
+                        {
+                            _state = State.READY;
+                        }
                         wake = _channel.getState().onWritePossible();
                         break;