diff --git a/lib/socket.io/client.js b/lib/socket.io/client.js
index b0f8f03863..1e4be7bb58 100644
--- a/lib/socket.io/client.js
+++ b/lib/socket.io/client.js
@@ -87,10 +87,17 @@ Client.prototype._onConnect = function(req, res){
     req.addListener('error', function(err){
       req.destroy && req.destroy();
     });
-    if (res) res.addListener('error', function(err){
-      res.destroy && res.destroy();
+    req.addListener('timeout', function(err){
+      req.destroy && req.destroy();
     });
-    
+    if (res){
+      res.addListener('error', function(err){
+        res.destroy && res.destroy();
+      });
+      res.addListener('timeout', function(err){
+        res.destroy && res.destroy();
+      });
+    }
     if (this._disconnectTimeout) clearTimeout(this._disconnectTimeout);
   }
 };