diff --git a/lib/query.js b/lib/query.js
index 02ed2258..7ba272bb 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -121,8 +121,8 @@ p.submit = function(connection) {
     connection.removeListener('rowDescription', handleRowDescription);
     connection.removeListener('dataRow', handleDatarow);
     connection.removeListener('readyForQuery', onReadyForQuery);
-    connection.removeListener('error', onError);
     connection.removeListener('commandComplete', onCommandComplete);
+    connection.removeListener('error', onError);
   };
 
   connection.on('rowDescription', handleRowDescription);