diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/intercept_queue.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/intercept_queue.cpp
index 79dde81fdb..4f4a44bf82 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/intercept_queue.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/intercept_queue.cpp
@@ -136,7 +136,7 @@ InterceptQueue::InterceptQueue(std::unique_ptr<Queue> queue)
   // Match the queue's signal ABI block to async_doorbell_'s
   // This allows us to use the queue's signal ABI block from devices to trigger async_doorbell while
   // host side use jumps directly to the queue's signal implementation.
-  if (core::Runtime::runtime_singleton_->flag().enable_dtif())
+  if (!core::g_use_interrupt_wait)
     async_doorbell_ = new DefaultSignal(DOORBELL_MAX);
   else
     async_doorbell_ = new InterruptSignal(DOORBELL_MAX);