diff --git a/packages/datadog-instrumentations/src/mysql2.js b/packages/datadog-instrumentations/src/mysql2.js
index 8cf3210106c..cc46486b81b 100644
--- a/packages/datadog-instrumentations/src/mysql2.js
+++ b/packages/datadog-instrumentations/src/mysql2.js
@@ -42,9 +42,14 @@ addHook({ name: 'mysql2', file: 'lib/connection.js', versions: ['>=1'] }, (Conne
       startOuterQueryCh.publish({ sql: sqlString, abortController })
 
       if (abortController.signal.aborted) {
-        let queryCommand = sql
-        if (sqlIsString) {
-          queryCommand = Connection.createQuery(sqlString, values, cb, this.config)
+        const addCommand = this.addCommand
+        this.addCommand = function (cmd) { return cmd }
+
+        let queryCommand
+        try {
+          queryCommand = query.apply(this, arguments)
+        } finally {
+          this.addCommand = addCommand
         }
 
         cb = queryCommand.onResult
@@ -78,7 +83,7 @@ addHook({ name: 'mysql2', file: 'lib/connection.js', versions: ['>=1'] }, (Conne
 
       if (abortController.signal.aborted) {
         const addCommand = this.addCommand
-        this.addCommand = function () {}
+        this.addCommand = function (cmd) { return cmd }
 
         let result
         try {