diff --git a/lib/http-proxy/passes/web-incoming.js b/lib/http-proxy/passes/web-incoming.js
index 419a5dfb6..e8521d671 100644
--- a/lib/http-proxy/passes/web-incoming.js
+++ b/lib/http-proxy/passes/web-incoming.js
@@ -170,21 +170,23 @@ module.exports = {
     proxyReq.on('response', function(proxyRes) {
       if(server) { server.emit('proxyRes', proxyRes, req, res); }
 
-      // Allow us to listen when the proxy has completed
-      proxyRes.on('end', function () {
-        server.emit('end', req, res, proxyRes);
-      });
-
-      if(!options.selfHandleResponse) {
+      if(!res.headersSent && !options.selfHandleResponse) {
         for(var i=0; i < web_o.length; i++) {
           if(web_o[i](req, res, proxyRes, options)) { break; }
         }
-  
-        proxyRes.pipe(res);
       }
-    });
 
-    //proxyReq.end();
+      if (!res.finished) {
+        // Allow us to listen when the proxy has completed
+        proxyRes.on('end', function () {
+          if (server) server.emit('end', req, res, proxyRes);
+        });
+        // We do this separately since we are also checking for res.finished
+        if (!options.selfHandleResponse) proxyRes.pipe(res);
+      } else {
+        if (server) server.emit('end', req, res, proxyRes);
+      }
+    });
   }
 
 };