diff --git a/clients/server/base.js b/clients/server/base.js
index <HASH>..<HASH> 100644
--- a/clients/server/base.js
+++ b/clients/server/base.js
@@ -49,11 +49,13 @@ exports.setup = function(Client, name, options) {
 
   // Default to draining on exit.
   if (poolInstance.drainOnExit !== false && typeof process === 'object') {
-    process.on('exit', function() {
+    function drainPool() {
       poolInstance.drain(function() {
-          poolInstance.destroyAllNow();
+        poolInstance.destroyAllNow();
       });
-    });
+    }
+    process.on('exit', drainPool);
+    process.on('SIGINT', drainPool);
   }
 };
Drain connection pool on SIGINT as well as exit