diff --git a/rocclr/runtime/platform/runtime.cpp b/rocclr/runtime/platform/runtime.cpp
index e7b5f70934..5224f6b3f1 100644
--- a/rocclr/runtime/platform/runtime.cpp
+++ b/rocclr/runtime/platform/runtime.cpp
@@ -85,8 +85,15 @@ void Runtime::tearDown() {
   Device::tearDown();
   option::teardown();
   Flag::tearDown();
+  initialized_ = false;
 }
 
+class RuntimeTearDown : public amd::HeapObject {
+public:
+  RuntimeTearDown() {}
+  ~RuntimeTearDown() { Runtime::tearDown(); }
+} runtime_tear_down;
+
 uint ReferenceCountedObject::retain() { return ++make_atomic(referenceCount_); }
 
 uint ReferenceCountedObject::release() {