From 7177e3aab082cc7964698221a9440cd92dfaed03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 13 Jun 2025 12:24:35 +0200
Subject: [PATCH] fix(core): Register transition handlers after modules init
 (#16308)

---
 packages/cli/src/commands/base-command.ts             | 5 -----
 packages/cli/src/commands/start.ts                    | 4 ++++
 packages/cli/src/modules/insights/insights.service.ts | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index 936fb83b171..834d600a487 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -31,7 +31,6 @@ import { ModuleRegistry } from '@/modules/module-registry';
 import { ModulesConfig } from '@/modules/modules.config';
 import { NodeTypes } from '@/node-types';
 import { PostHogClient } from '@/posthog';
-import { MultiMainSetup } from '@/scaling/multi-main-setup.ee';
 import { ShutdownService } from '@/shutdown/shutdown.service';
 import { WorkflowHistoryManager } from '@/workflows/workflow-history.ee/workflow-history-manager.ee';
 
@@ -86,10 +85,6 @@ export abstract class BaseCommand extends Command {
 		}
 
 		this.moduleRegistry.addEntities();
-
-		if (this.instanceSettings.isMultiMain) {
-			Container.get(MultiMainSetup).registerEventHandlers();
-		}
 	}
 
 	async init(): Promise<void> {
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index d4037561eba..fd48ec1126a 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -249,6 +249,10 @@ export class Start extends BaseCommand {
 		}
 
 		await this.moduleRegistry.initModules();
+
+		if (this.instanceSettings.isMultiMain) {
+			Container.get(MultiMainSetup).registerEventHandlers();
+		}
 	}
 
 	async initOrchestration() {
diff --git a/packages/cli/src/modules/insights/insights.service.ts b/packages/cli/src/modules/insights/insights.service.ts
index 8c3535d245b..de60f5994de 100644
--- a/packages/cli/src/modules/insights/insights.service.ts
+++ b/packages/cli/src/modules/insights/insights.service.ts
@@ -27,7 +27,6 @@ export class InsightsService {
 		this.logger = this.logger.scoped('insights');
 	}
 
-	@OnLeaderTakeover()
 	startTimers() {
 		this.collectionService.startFlushingTimer();