diff --git a/sycl/source/detail/graph/graph_impl.cpp b/sycl/source/detail/graph/graph_impl.cpp
index f094b5bfe20d..0427c0a0c6ad 100644
--- a/sycl/source/detail/graph/graph_impl.cpp
+++ b/sycl/source/detail/graph/graph_impl.cpp
@@ -742,8 +742,9 @@ exec_graph_impl::enqueueNodeDirect(const sycl::context &Ctx,
   const bool xptiEnabled = xptiTraceEnabled();
   xpti_td *CmdTraceEvent = nullptr;
   uint64_t InstanceID = 0;
-  auto StreamID = detail::getActiveXPTIStreamID();
+  uint8_t StreamID = 0;
   if (xptiEnabled) {
+    StreamID = detail::getActiveXPTIStreamID();
     sycl::detail::CGExecKernel *CGExec =
         static_cast<sycl::detail::CGExecKernel *>(Node.MCommandGroup.get());
     sycl::detail::code_location CodeLoc(CGExec->MFileName.c_str(),
diff --git a/sycl/source/detail/queue_impl.cpp b/sycl/source/detail/queue_impl.cpp
index b8c2a2866a62..98af8f194484 100644
--- a/sycl/source/detail/queue_impl.cpp
+++ b/sycl/source/detail/queue_impl.cpp
@@ -448,11 +448,12 @@ EventImplPtr queue_impl::submit_kernel_scheduler_bypass(
 #ifdef XPTI_ENABLE_INSTRUMENTATION
     xpti_td *CmdTraceEvent = nullptr;
     uint64_t InstanceID = 0;
-    auto StreamID = detail::getActiveXPTIStreamID();
+    uint8_t StreamID = 0;
     // Only enable instrumentation if there are subscribes to the SYCL
     // stream
-    const bool xptiEnabled = xptiCheckTraceEnabled(StreamID);
+    const bool xptiEnabled = xptiTraceEnabled();
     if (xptiEnabled) {
+      StreamID = detail::getActiveXPTIStreamID();
       std::tie(CmdTraceEvent, InstanceID) = emitKernelInstrumentationData(
           StreamID, KernelImplPtr, CodeLoc, IsTopCodeLoc,
           *KData.getDeviceKernelInfoPtr(), this, KData.getNDRDesc(),
@@ -843,8 +844,12 @@ void queue_impl::wait(const detail::code_location &CodeLoc) {
   void *TelemetryEvent = nullptr;
   uint64_t IId;
   std::string Name;
-  auto StreamID = detail::getActiveXPTIStreamID();
-  TelemetryEvent = instrumentationProlog(CodeLoc, Name, StreamID, IId);
+  uint8_t StreamID = 0;
+  const bool xptiEnabled = xptiTraceEnabled();
+  if (xptiEnabled) {
+    StreamID = detail::getActiveXPTIStreamID();
+    TelemetryEvent = instrumentationProlog(CodeLoc, Name, StreamID, IId);
+  }
 #endif
 
   if (!MGraph.expired()) {
@@ -926,7 +931,9 @@ void queue_impl::wait(const detail::code_location &CodeLoc) {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
   // There is an early return in instrumentationEpilog() if no subscribers are
   // subscribing to queue.wait().
-  instrumentationEpilog(TelemetryEvent, Name, StreamID, IId);
+  if (xptiEnabled) {
+    instrumentationEpilog(TelemetryEvent, Name, StreamID, IId);
+  }
 #endif
 }