diff --git a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
index 7f230602bd81c..ad906d91ed92d 100644
--- a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
+++ b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
@@ -1,6 +1,7 @@
 import { LoggerProxy, jsonParse } from 'n8n-workflow';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import type { DeleteResult } from 'typeorm';
+import { In } from 'typeorm';
 import type {
 	EventMessageTypes,
 	EventNamesTypes,
@@ -132,7 +133,23 @@ export class MessageEventBus extends EventEmitter {
 			this.logWriter?.startLogging();
 			await this.send(unsentAndUnfinished.unsentMessages);
 
-			const unfinishedExecutionIds = Object.keys(unsentAndUnfinished.unfinishedExecutions);
+			let unfinishedExecutionIds = Object.keys(unsentAndUnfinished.unfinishedExecutions);
+
+			// if we are in queue mode, running jobs may still be running on a worker despite the main process
+			// crashing, so we can't just mark them as crashed
+			if (config.get('executions.mode') !== 'queue') {
+				const dbUnfinishedExecutionIds = (
+					await Container.get(ExecutionRepository).find({
+						where: {
+							status: In(['running', 'new', 'unknown']),
+						},
+						select: ['id'],
+					})
+				).map((e) => e.id);
+				unfinishedExecutionIds = Array.from(
+					new Set<string>([...unfinishedExecutionIds, ...dbUnfinishedExecutionIds]),
+				);
+			}
 
 			if (unfinishedExecutionIds.length > 0) {
 				LoggerProxy.warn(`Found unfinished executions: ${unfinishedExecutionIds.join(', ')}`);
@@ -160,11 +177,18 @@ export class MessageEventBus extends EventEmitter {
 					this.logWriter?.startRecoveryProcess();
 					for (const executionId of unfinishedExecutionIds) {
 						LoggerProxy.warn(`Attempting to recover execution ${executionId}`);
-						await recoverExecutionDataFromEventLogMessages(
-							executionId,
-							unsentAndUnfinished.unfinishedExecutions[executionId],
-							true,
-						);
+						if (!unsentAndUnfinished.unfinishedExecutions[executionId]?.length) {
+							LoggerProxy.debug(
+								`No event messages found, marking execution ${executionId} as 'crashed'`,
+							);
+							await Container.get(ExecutionRepository).markAsCrashed([executionId]);
+						} else {
+							await recoverExecutionDataFromEventLogMessages(
+								executionId,
+								unsentAndUnfinished.unfinishedExecutions[executionId],
+								true,
+							);
+						}
 					}
 				}
 				// remove the recovery process flag file
diff --git a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
index 2cb718b8f8287..1e02cc95126cb 100644
--- a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
+++ b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
@@ -11,7 +11,7 @@ import { ExecutionRepository } from '@db/repositories';
 export async function recoverExecutionDataFromEventLogMessages(
 	executionId: string,
 	messages: EventMessageTypes[],
-	applyToDb = true,
+	applyToDb: boolean,
 ): Promise<IRunExecutionData | undefined> {
 	const executionEntry = await Container.get(ExecutionRepository).findSingleExecution(executionId, {
 		includeData: true,
diff --git a/packages/cli/test/integration/eventbus.ee.test.ts b/packages/cli/test/integration/eventbus.ee.test.ts
index 10006138482b7..d8e5cf6137a0f 100644
--- a/packages/cli/test/integration/eventbus.ee.test.ts
+++ b/packages/cli/test/integration/eventbus.ee.test.ts
@@ -24,6 +24,8 @@ import type { MessageEventBusDestinationWebhook } from '@/eventbus/MessageEventB
 import type { MessageEventBusDestinationSentry } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee';
 import { EventMessageAudit } from '@/eventbus/EventMessageClasses/EventMessageAudit';
 import type { EventNamesTypes } from '@/eventbus/EventMessageClasses';
+import { EventMessageWorkflow } from '@/eventbus/EventMessageClasses/EventMessageWorkflow';
+import { EventMessageNode } from '@/eventbus/EventMessageClasses/EventMessageNode';
 
 jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
 jest.mock('axios');
@@ -389,3 +391,57 @@ test('DELETE /eventbus/destination delete all destinations by id', async () => {
 
 	expect(Object.keys(eventBus.destinations).length).toBe(0);
 });
+
+// These two tests are running very flaky on CI due to the logwriter working in a worker
+// Mocking everything on the other would defeat the purpose of even testing them... so, skipping in CI for now.
+// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+test.skip('should not find unfinished executions in recovery process', async () => {
+	eventBus.logWriter?.putMessage(
+		new EventMessageWorkflow({
+			eventName: 'n8n.workflow.started',
+			payload: { executionId: '509', isManual: false },
+		}),
+	);
+	eventBus.logWriter?.putMessage(
+		new EventMessageNode({
+			eventName: 'n8n.node.started',
+			payload: { executionId: '509', nodeName: 'Set', workflowName: 'test' },
+		}),
+	);
+	eventBus.logWriter?.putMessage(
+		new EventMessageNode({
+			eventName: 'n8n.node.finished',
+			payload: { executionId: '509', nodeName: 'Set', workflowName: 'test' },
+		}),
+	);
+	eventBus.logWriter?.putMessage(
+		new EventMessageWorkflow({
+			eventName: 'n8n.workflow.success',
+			payload: { executionId: '509', success: true },
+		}),
+	);
+	const unfinishedExecutions = await eventBus.getUnfinishedExecutions();
+
+	expect(Object.keys(unfinishedExecutions)).toHaveLength(0);
+});
+
+// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+test.skip('should not find unfinished executions in recovery process', async () => {
+	eventBus.logWriter?.putMessage(
+		new EventMessageWorkflow({
+			eventName: 'n8n.workflow.started',
+			payload: { executionId: '510', isManual: false },
+		}),
+	);
+	eventBus.logWriter?.putMessage(
+		new EventMessageNode({
+			eventName: 'n8n.node.started',
+			payload: { executionId: '510', nodeName: 'Set', workflowName: 'test' },
+		}),
+	);
+
+	const unfinishedExecutions = await eventBus.getUnfinishedExecutions();
+
+	expect(Object.keys(unfinishedExecutions)).toHaveLength(1);
+	expect(Object.keys(unfinishedExecutions)).toContain('510');
+});