diff --git a/hipamd/src/hip_graph_internal.cpp b/hipamd/src/hip_graph_internal.cpp
index 93beca5327..18ef41da64 100644
--- a/hipamd/src/hip_graph_internal.cpp
+++ b/hipamd/src/hip_graph_internal.cpp
@@ -690,7 +690,7 @@ hipError_t hipGraphExec::CreateQueues(size_t numQueues) {
   for (size_t i = 0; i < numQueues; i++) {
     amd::HostQueue* queue;
     cl_command_queue_properties properties =
-        (callbacks_table.is_enabled() || HIP_FORCE_QUEUE_PROFILING) ? CL_QUEUE_PROFILING_ENABLE : 0;
+        callbacks_table.is_enabled() ? CL_QUEUE_PROFILING_ENABLE : 0;
     queue = new amd::HostQueue(*hip::getCurrentDevice()->asContext(),
                                *hip::getCurrentDevice()->devices()[0], properties,
                                amd::CommandQueue::RealTimeDisabled, amd::CommandQueue::Priority::Normal);
diff --git a/hipamd/src/hip_stream.cpp b/hipamd/src/hip_stream.cpp
index 7c915d6979..2772969178 100644
--- a/hipamd/src/hip_stream.cpp
+++ b/hipamd/src/hip_stream.cpp
@@ -81,7 +81,7 @@ bool Stream::Create() {
   // or if we force it with env var. This would enable time stamp collection for every
   // command submitted to the stream(queue).
   bool isProfilerAttached = callbacks_table.is_enabled();
-  cl_command_queue_properties properties = (isProfilerAttached || HIP_FORCE_QUEUE_PROFILING) ?
+  cl_command_queue_properties properties = isProfilerAttached ?
                                              CL_QUEUE_PROFILING_ENABLE : 0;
   amd::CommandQueue::Priority p;
   switch (priority_) {