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 d32b5a450a..e4b923ac21 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
@@ -2256,12 +2256,12 @@ void Runtime::Unload() {
   mapped_handle_map_.clear();
   memory_handle_map_.clear();
 
-  DestroyAgents();
-
   CloseTools();
 
   AMD::Unload();
 
+  DestroyAgents();
+
   DestroyDrivers();
 
   thunkLoader_->DestroyThunkInstance();