diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp
index 5401f907bc874d..0abcdb563ad9f7 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.cpp
+++ b/examples/chip-tool/commands/common/CHIPCommand.cpp
@@ -225,6 +225,11 @@ void CHIPCommand::MaybeTearDownStack()
     {
         ShutdownCommissioner(commissioner.first);
     }
+    mCommissioners.clear();
+    sICDClientStorage.Shutdown();
+    sCheckInHandler.Shutdown();
+    sGroupDataProvider.Finish();
+    DeviceControllerFactory::GetInstance().Shutdown();
 
     StopTracing();
 }