diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
index 51255aac059..34cc9e499a6 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
@@ -278,7 +278,7 @@ public class HttpConnection extends AbstractConnection implements Dumpable
                         long filled = _parser.parseAvailable();
                         io += filled;
 
-                        if (_parser.isIdle() && _endp.isInputShutdown())
+                        if (_parser.isIdle() && (_endp.isInputShutdown() || !_endp.isOpen()))
                             throw new EOFException();
                     }