diff --git a/rocclr/device/rocm/rocvirtual.cpp b/rocclr/device/rocm/rocvirtual.cpp
index c173d60dd0..dfea660d1c 100644
--- a/rocclr/device/rocm/rocvirtual.cpp
+++ b/rocclr/device/rocm/rocvirtual.cpp
@@ -186,11 +186,9 @@ void Timestamp::checkGpuTime() {
 bool HsaAmdSignalHandler(hsa_signal_value_t value, void* arg) {
   Timestamp* ts = reinterpret_cast<Timestamp*>(arg);
 
-  static std::shared_ptr<amd::Thread> thread;
-  if (amd::Thread::current() == nullptr) {
-    thread = std::make_shared<amd::HostThread>();
-  }
-  if (thread.get() != amd::Thread::current()) {
+  amd::Thread* thread = amd::Thread::current();
+  if (!(thread != nullptr ||
+      ((thread = new amd::HostThread()) != nullptr && thread == amd::Thread::current()))) {
     return false;
   }