diff --git a/apps/webapp/app/v3/services/triggerScheduledTask.server.ts b/apps/webapp/app/v3/services/triggerScheduledTask.server.ts index a6acc3d569..abc61bf33b 100644 --- a/apps/webapp/app/v3/services/triggerScheduledTask.server.ts +++ b/apps/webapp/app/v3/services/triggerScheduledTask.server.ts @@ -40,6 +40,23 @@ export class TriggerScheduledTaskService extends BaseService { } if (!instance.taskSchedule.active) { + shouldTrigger = false; + } else if (instance.environment.organization.deletedAt) { + logger.debug("Organization is deleted, disabling schedule", { + instanceId, + scheduleId: instance.taskSchedule.friendlyId, + organizationId: instance.environment.organization.id, + }); + + await this._prisma.taskSchedule.update({ + where: { + id: instance.taskSchedule.id, + }, + data: { + active: false, + }, + }); + shouldTrigger = false; }