diff --git a/rocclr/runtime/utils/flags.hpp b/rocclr/runtime/utils/flags.hpp
index 5cdee5b26c..6b18aaaf96 100644
--- a/rocclr/runtime/utils/flags.hpp
+++ b/rocclr/runtime/utils/flags.hpp
@@ -154,7 +154,7 @@ release(bool, GPU_USE_DEVICE_QUEUE, false,                                    \
         "Use a dedicated device queue for the actual submissions")            \
 release(bool, GPU_ENABLE_LARGE_ALLOCATION, false,                             \
         "Enable >4GB single allocations")                                     \
-release(bool, AMD_THREAD_TRACE_ENABLE, false,                                 \
+release(bool, AMD_THREAD_TRACE_ENABLE, !IS_MAINLINE,                          \
         "Enable thread trace extension")                                      \
 release(uint, OPENCL_VERSION, 200,                                            \
         "Force GPU opencl verison")                                           \