diff --git a/storage/innobase/pars/pars0grm.cc b/storage/innobase/pars/pars0grm.cc
index 10d0d0becd7..1e10a61f5ad 100644
--- a/storage/innobase/pars/pars0grm.cc
+++ b/storage/innobase/pars/pars0grm.cc
@@ -79,7 +79,7 @@ que_node_t */
 #include "que0que.h"
 #include "row0sel.h"
 
-#ifdef __GNUC__
+#if defined __GNUC__ && (!defined __clang_major__ || __clang_major__ > 11)
 #pragma GCC diagnostic ignored "-Wfree-nonheap-object"
 #endif
 
diff --git a/storage/innobase/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y
index 3fb0865f608..ed2b9bc09b0 100644
--- a/storage/innobase/pars/pars0grm.y
+++ b/storage/innobase/pars/pars0grm.y
@@ -38,7 +38,7 @@ que_node_t */
 #include "que0que.h"
 #include "row0sel.h"
 
-#ifdef __GNUC__
+#if defined __GNUC__ && (!defined __clang_major__ || __clang_major__ > 11)
 #pragma GCC diagnostic ignored "-Wfree-nonheap-object"
 #endif