diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 3beb4ef51e5..807dba72261 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -162,6 +162,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - rabbitmq/queue - Change the mapping type of `rabbitmq.queue.consumers.utilisation.pct` to `scaled_float` from `long` because the values fall within the range of `[0.0, 1.0]`. Previously, conversion to integer resulted in reporting either `0` or `1`.
 - Fix timeout caused by the retrival of which indices are hidden {pull}39165[39165]
 - Fix Azure Monitor support for multiple aggregation types {issue}39192[39192] {pull}39204[39204]
+- Fix for MySQL/Performance - Query failure for MySQL versions below v8.0.1, for performance metric `quantile_95`. {pull}38710[38710]
 
 *Osquerybeat*
 
diff --git a/metricbeat/module/mysql/performance/manifest.yml b/metricbeat/module/mysql/performance/manifest.yml
index 51aa01614b5..84eb953ab95 100644
--- a/metricbeat/module/mysql/performance/manifest.yml
+++ b/metricbeat/module/mysql/performance/manifest.yml
@@ -6,10 +6,10 @@ input:
     namespace: performance
     queries:
       - query: >
-          SELECT digest_text, count_star, avg_timer_wait, max_timer_wait, last_seen, quantile_95
-            FROM performance_schema.events_statements_summary_by_digest
-            ORDER BY avg_timer_wait DESC
-            LIMIT 10
+          SELECT digest_text, count_star, avg_timer_wait, max_timer_wait, last_seen /*!80001 ,quantile_95 */ 
+            FROM performance_schema.events_statements_summary_by_digest 
+            ORDER BY avg_timer_wait DESC 
+            LIMIT 10;
         query_namespace: events_statements
         response_format: table
         replace_underscores: true