diff --git a/appsec/src/helper/subscriber/waf.cpp b/appsec/src/helper/subscriber/waf.cpp
index edffb4691e..93894419c7 100644
--- a/appsec/src/helper/subscriber/waf.cpp
+++ b/appsec/src/helper/subscriber/waf.cpp
@@ -266,7 +266,9 @@ void instance::listener::get_meta_and_metrics(
 
     for (const auto &[key, value] : schemas_) {
         std::string schema = value;
-        if (value.length() > max_plain_schema_allowed) {
+        if (value.length() > max_plain_schema_allowed &&
+            key.starts_with("_dd.appsec.s")) {
+
             auto encoded = compress(schema);
             if (encoded) {
                 schema = base64_encode(encoded.value(), false);
diff --git a/appsec/tests/helper/client_test.cpp b/appsec/tests/helper/client_test.cpp
index 109c12970f..8dd0f8fb2f 100644
--- a/appsec/tests/helper/client_test.cpp
+++ b/appsec/tests/helper/client_test.cpp
@@ -1801,7 +1801,7 @@ TEST(ClientTest, RequestShutdownWithAttackAndFingerprint)
         EXPECT_EQ(msg_res->triggers.size(), 0);
     }
 
-    // Request Execution
+    // Request Shutdown
     {
         network::request_shutdown::request msg;
         msg.data = parameter::map();