diff --git a/lib/detached-processes/cleanup-process.ts b/lib/detached-processes/cleanup-process.ts
index 825b48d613..a6bd0c7975 100644
--- a/lib/detached-processes/cleanup-process.ts
+++ b/lib/detached-processes/cleanup-process.ts
@@ -166,6 +166,8 @@ process.on("message", async (cleanupProcessMessage: ICleanupMessageBase) => {
 process.on("disconnect", async () => {
 	fileLogService.logData({ message: "cleanup-process received process.disconnect event" });
 	await executeCleanup();
+	$injector.dispose();
+	process.exit();
 });
 
 fileLogService.logData({ message: `cleanup-process will send ${DetachedProcessMessages.ProcessReadyToReceive} message` });
diff --git a/lib/services/analytics/analytics-broker-process.ts b/lib/services/analytics/analytics-broker-process.ts
index 9fee55b3a5..5e7439af26 100644
--- a/lib/services/analytics/analytics-broker-process.ts
+++ b/lib/services/analytics/analytics-broker-process.ts
@@ -29,7 +29,7 @@ const finishTracking = async (data?: ITrackingInformation) => {
 	analyticsLoggingService.logData({ message: `analytics-broker-process finish tracking started` });
 	await trackingQueue;
 	analyticsLoggingService.logData({ message: `analytics-broker-process tracking finished` });
-	process.disconnect();
+	$injector.dispose();
 	process.exit();
 };