diff --git a/lib/pool.js b/lib/pool.js
index 9cf9aabf0..02e7ddbb5 100644
--- a/lib/pool.js
+++ b/lib/pool.js
@@ -33,6 +33,11 @@ var pools = {
             pool.destroy(client);
           });
 
+          // Remove connection from pool on disconnect
+          client.on('end', function(e) {
+            pool.destroy(client);
+          });
+
           return cb(null, client);
         });
       },