diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c

index 16e39be..2543693 100644

--- a/server/mpm/event/event.c

+++ b/server/mpm/event/event.c

@@ -1111,10 +1111,11 @@ read_request:

                           "network write failure in core output filter");

             cs->pub.state = CONN_STATE_LINGER;

         }

-        else if (c->data_in_output_filters) {

+        else if (c->data_in_output_filters ||

+                 cs->pub.sense == CONN_SENSE_WANT_READ) {

             /* Still in WRITE_COMPLETION_STATE:

-             * Set a write timeout for this connection, and let the

-             * event thread poll for writeability.

+             * Set a read/write timeout for this connection, and let the

+             * event thread poll for read/writeability.

              */

             cs->queue_timestamp = apr_time_now();

             notify_suspend(cs);