diff --git a/plugins/base/utils/connection-manager.cpp b/plugins/base/utils/connection-manager.cpp
index d9077106..c869eda2 100644
--- a/plugins/base/utils/connection-manager.cpp
+++ b/plugins/base/utils/connection-manager.cpp
@@ -23,6 +23,7 @@ bool setup()
 {
 	AddSaveStep(saveConnections);
 	AddLoadStep(loadConnections);
+	AddPluginCleanupStep([]() { connections.clear(); });
 	return true;
 }
 
diff --git a/plugins/mqtt/mqtt-helpers.cpp b/plugins/mqtt/mqtt-helpers.cpp
index bdb3ec2c..47b4d4cc 100644
--- a/plugins/mqtt/mqtt-helpers.cpp
+++ b/plugins/mqtt/mqtt-helpers.cpp
@@ -718,6 +718,7 @@ static bool setup()
 {
 	AddSaveStep(SaveMqttConnections);
 	AddLoadStep(LoadMqttConnections);
+	AddPluginCleanupStep([]() { GetMqttConnections().clear(); });
 	return true;
 }