diff --git a/haproxy.c b/haproxy.c
index 7b5daf2..34cb0bb 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -3032,7 +3032,10 @@
     FD_CLR(s->cli_fd, StaticReadEvent);
     FD_SET(s->cli_fd, StaticWriteEvent);
     tv_eternity(&s->crexpire);
-    tv_delayfrom(&s->cwexpire, &now, s->proxy->clitimeout);
+    if (s->proxy->clitimeout)
+	tv_delayfrom(&s->cwexpire, &now, s->proxy->clitimeout);
+    else
+	tv_eternity(&s->cwexpire);
     shutdown(s->cli_fd, SHUT_RD);
     s->cli_state = CL_STSHUTR;
     buffer_flush(s->rep);