diff --git a/projects/aqlprofile/gfxip/gfx11/gfx11_primitives.h b/projects/aqlprofile/gfxip/gfx11/gfx11_primitives.h
index 517aba21fe..f53f251051 100644
--- a/projects/aqlprofile/gfxip/gfx11/gfx11_primitives.h
+++ b/projects/aqlprofile/gfxip/gfx11/gfx11_primitives.h
@@ -539,8 +539,7 @@ class gfx11_cntx_prim {
         SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, SIMD_SEL, simd) |
         SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, WGP_SEL, wgp) |
         SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, SA_SEL, 0x0) |
-        SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, WTYPE_INCLUDE, 1 << 6) |
-        SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, EXCLUDE_NONDETAIL_SHADERDATA, 1);
+        SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, WTYPE_INCLUDE, 1 << 6);
     return sq_thread_trace_mask;
 #else
     return 0;
diff --git a/projects/aqlprofile/gfxip/gfx12/gfx12_primitives.h b/projects/aqlprofile/gfxip/gfx12/gfx12_primitives.h
index 525f00ee5b..adf7249552 100644
--- a/projects/aqlprofile/gfxip/gfx12/gfx12_primitives.h
+++ b/projects/aqlprofile/gfxip/gfx12/gfx12_primitives.h
@@ -475,12 +475,7 @@ class gfx12_cntx_prim {
         SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, SIMD_SEL, simd) |
         SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, WGP_SEL, wgp) |
         SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, SA_SEL, 0x0) |
-        SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, WTYPE_INCLUDE,
-                           1 << 6) |  // SQ_TT_WTYPE_INCLUDE_CS_BIT
-        SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, EXCLUDE_NONDETAIL_SHADERDATA, 1);
-    // sq_thread_trace_mask = SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK,
-    // EXCLUDE_NONDETAIL_WAVESTART_EXT, 1) |
-    //        SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, EXCLUDE_NONDETAIL_ALLOC, 1);
+        SET_REG_FIELD_BITS(SQ_THREAD_TRACE_MASK, WTYPE_INCLUDE, 0x40); // SQ_TT_WTYPE_INCLUDE_CS_BIT
     return sq_thread_trace_mask;
   }
   // not supported in gfx12