diff --git a/src/database.js b/src/database.js
index c5d4a315d..c52c5916b 100644
--- a/src/database.js
+++ b/src/database.js
@@ -145,7 +145,9 @@ function rollback(connection, transactionError, callback) {
     connection.rollback(function (error) {
         if (error) debug('rollback: error when rolling back', error);
 
+        connection.removeAllListeners('error');
         connection.release();
+
         callback(transactionError);
     });
 }
@@ -169,7 +171,9 @@ function transaction(queries, callback) {
             connection.commit(function (error) {
                 if (error) return rollback(connection, error, callback);
 
+                connection.removeAllListeners('error');
                 connection.release();
+
                 callback(null, results);
             });
         });