diff --git a/lib/http-proxy/passes/web-incoming.js b/lib/http-proxy/passes/web-incoming.js
index 995a0db4d..abd8dc743 100644
--- a/lib/http-proxy/passes/web-incoming.js
+++ b/lib/http-proxy/passes/web-incoming.js
@@ -50,9 +50,8 @@ module.exports = {
    */
 
   timeout: function timeout(req, res, options) {
-    if(options.timeout) {
-      req.socket.setTimeout(options.timeout);
-    }
+    var timeoutValue = (options.timeout ? options.timeout : 0);
+    req.socket.setTimeout(timeoutValue);
   },
 
   /**