diff --git a/agent/agents/mysql/perfschema/perfschema.go b/agent/agents/mysql/perfschema/perfschema.go
index 4a1efba1025..d47f7306437 100644
--- a/agent/agents/mysql/perfschema/perfschema.go
+++ b/agent/agents/mysql/perfschema/perfschema.go
@@ -371,7 +371,7 @@ func (m *PerfSchema) getNewBuckets(periodStart time.Time, periodLengthSecs uint3
 					b.Common.Comments = comments
 				}
 			}
-		} else if !strings.Contains(b.Common.Fingerprint, "?") {
+		} else if !strings.Contains(b.Common.Fingerprint, "?") && !m.disableQueryExamples {
 			b.Common.Example = b.Common.Fingerprint
 			b.Common.ExampleType = agentv1.ExampleType_EXAMPLE_TYPE_RANDOM