diff --git a/packages/twenty-server/src/engine/integrations/message-queue/message-queue.explorer.ts b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.explorer.ts
index 1d5cbf473..49730821b 100644
--- a/packages/twenty-server/src/engine/integrations/message-queue/message-queue.explorer.ts
+++ b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.explorer.ts
@@ -156,7 +156,7 @@ export class MessageQueueExplorer implements OnModuleInit {
       }),
     );
 
-    if (isRequestScoped && job.data) {
+    if (isRequestScoped) {
       const contextId = createContextId();
 
       if (this.moduleRef.registerRequestByContextId) {
@@ -164,7 +164,7 @@ export class MessageQueueExplorer implements OnModuleInit {
           {
             // Add workspaceId to the request object
             req: {
-              workspaceId: job.data.workspaceId,
+              workspaceId: job.data?.workspaceId,
             },
           },
           contextId,
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts
index 4f4e23871..cbb1eba30 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts
@@ -1,5 +1,4 @@
 import { InjectRepository } from '@nestjs/typeorm';
-import { Scope } from '@nestjs/common';
 
 import { Repository, In } from 'typeorm';
 
@@ -11,15 +10,14 @@ import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decora
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { BillingService } from 'src/engine/core-modules/billing/billing.service';
 import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
-import { CalendarChannelWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
 import {
   CalendarEventsImportJobData,
   CalendarEventsImportJob,
 } from 'src/modules/calendar/calendar-event-import-manager/jobs/calendar-events-import.job';
+import { CalendarChannelWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
 
 @Processor({
   queueName: MessageQueue.cronQueue,
-  scope: Scope.REQUEST,
 })
 export class CalendarEventsImportCronJob {
   constructor(