diff --git a/NEWS b/NEWS
index cb214b2e..2353c9e7 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ NEWS
 - 1.4.27 -
   * Fix handling return value of SSL_CTX_set_options (fixes #2157, thx mlcreech)
   * Fix mod_proxy HUP handling (send final chunk, fix usage counter)
+  * mod_proxy: close connection on write error (fixes #2114)
 
 - 1.4.26 - 2010-02-07
   * Fix request parser to handle packets with splitted \r\n\r\n (fixes #2105)
diff --git a/src/mod_proxy.c b/src/mod_proxy.c
index 93a65cbd..257dd390 100644
--- a/src/mod_proxy.c
+++ b/src/mod_proxy.c
@@ -852,11 +852,11 @@ static handler_t proxy_write_request(server *srv, handler_ctx *hctx) {
 		if (-1 == ret) { /* error on our side */
 			log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed:", strerror(errno), errno);
 
-			return HANDLER_WAIT_FOR_EVENT;
+			return HANDLER_ERROR;
 		} else if (-2 == ret) { /* remote close */
 			log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed, remote connection close:", strerror(errno), errno);
 
-			return HANDLER_WAIT_FOR_EVENT;
+			return HANDLER_ERROR;
 		}
 
 		if (hctx->wb->bytes_out == hctx->wb->bytes_in) {