diff --git a/rocclr/runtime/utils/debug.hpp b/rocclr/runtime/utils/debug.hpp
index c3273505f8..d025bdb983 100644
--- a/rocclr/runtime/utils/debug.hpp
+++ b/rocclr/runtime/utils/debug.hpp
@@ -157,10 +157,9 @@ inline void warning(const char* msg) { amd::report_warning(msg); }
 
 #define DebugInfoGuarantee(cond) LogGuarantee(cond, amd::LOG_INFO, "Warning")
 
-#ifndef NDEBUG
-#define CL_LOG
-#endif
 // You may define CL_LOG to enable following log functions even for release build
+#define CL_LOG
+
 #ifdef CL_LOG
 #define ClPrint(level, mask, format, ...)                                                          \
   do {                                                                                             \
diff --git a/rocclr/runtime/utils/flags.hpp b/rocclr/runtime/utils/flags.hpp
index cd5c914e4c..60a048e1d0 100644
--- a/rocclr/runtime/utils/flags.hpp
+++ b/rocclr/runtime/utils/flags.hpp
@@ -10,7 +10,7 @@
                                                                               \
 release(int, LOG_LEVEL, 0,                                                    \
         "The default log level")                                              \
-release(uint, GPU_LOG_MASK, 0,                                                \
+release(uint, GPU_LOG_MASK, 0X7FFFFFFF,                                       \
         "The mask to enable specific kinds of logs")                          \
 debug(uint, DEBUG_GPU_FLAGS, 0,                                               \
         "The debug options for GPU device")                                   \