diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_kernel.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_kernel.cpp
index 4b50035093..62366e1dc5 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_kernel.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_kernel.cpp
@@ -601,7 +601,8 @@ hsa_status_t BlitKernel::Destroy() {
   }
 
   if (completion_signal_.handle != 0) {
-    HSA::hsa_signal_destroy(completion_signal_);
+    core::Signal* signal = core::Signal::Convert(completion_signal_);
+    signal->DestroySignal();
   }
 
   return HSA_STATUS_SUCCESS;
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
index 8f98540d0e..4cb3eb7fac 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
@@ -2470,14 +2470,12 @@ void Runtime::Unload() {
   asyncExceptions_.reset();
 
   if (vm_fault_signal_ != nullptr) {
-    vm_fault_signal_->DestroySignal();
     vm_fault_signal_.reset();
   }
   
   vm_fault_event_.reset();
 
   if (hw_exception_signal_ != nullptr) {
-    hw_exception_signal_->DestroySignal();
     hw_exception_signal_.reset();
   }