diff --git a/bitbylaw/steps/advoware_cal_sync/calendar_sync_api_step.py b/bitbylaw/steps/advoware_cal_sync/calendar_sync_api_step.py
index c778dfc3..cb841ab6 100644
--- a/bitbylaw/steps/advoware_cal_sync/calendar_sync_api_step.py
+++ b/bitbylaw/steps/advoware_cal_sync/calendar_sync_api_step.py
@@ -12,8 +12,7 @@ config = {
     'flows': ['advoware']
 }
 
-async def handler(req):
-    context = req.context
+async def handler(req, context):
     try:
         # Konfiguration aus Request-Body
         body = req.get('body', {})
@@ -37,7 +36,7 @@ async def handler(req):
             socket_timeout=Config.REDIS_TIMEOUT_SECONDS
         )
         
-        if redis_client.get(employee_lock_key):
+        if redis_client.set(employee_lock_key, 'api', ex=1800, nx=True) is None:
             context.logger.info(f"Calendar Sync API: Sync bereits aktiv für {kuerzel}, überspringe")
             return {
                 'status': 409,
@@ -51,9 +50,7 @@ async def handler(req):
 
         context.logger.info(f"Calendar Sync API aufgerufen für {kuerzel}")
         
-        # Setze Lock für 30 Minuten
-        redis_client.set(employee_lock_key, 'api', ex=1800)
-        context.logger.info(f"Calendar Sync API: Lock gesetzt für {kuerzel}")
+        # Lock erfolgreich gesetzt, jetzt emittieren
 
         # Emit Event für den Sync
         await context.emit({
diff --git a/bitbylaw/steps/advoware_cal_sync/calendar_sync_cron_step.py b/bitbylaw/steps/advoware_cal_sync/calendar_sync_cron_step.py
index 0cfeb75d..7e1f518e 100644
--- a/bitbylaw/steps/advoware_cal_sync/calendar_sync_cron_step.py
+++ b/bitbylaw/steps/advoware_cal_sync/calendar_sync_cron_step.py
@@ -50,6 +50,19 @@ async def handler(context):
                 context.logger.info(f"DEBUG: Überspringe {kuerzel}, nur SB wird gesynct")
                 continue
 
+            employee_lock_key = f'calendar_sync_lock_{kuerzel}'
+
+            redis_client = redis.Redis(
+                host=Config.REDIS_HOST,
+                port=int(Config.REDIS_PORT),
+                db=int(Config.REDIS_DB_CALENDAR_SYNC),
+                socket_timeout=Config.REDIS_TIMEOUT_SECONDS
+            )
+
+            if redis_client.set(employee_lock_key, 'cron', ex=1800, nx=True) is None:
+                context.logger.info(f"Calendar Sync Cron: Sync bereits aktiv für {kuerzel}, überspringe")
+                continue
+
             # Emit event for this employee
             await context.emit({
                 "topic": "calendar_sync_employee",
diff --git a/bitbylaw/types.d.ts b/bitbylaw/types.d.ts
index 1b6dc553..91d8125a 100644
--- a/bitbylaw/types.d.ts
+++ b/bitbylaw/types.d.ts
@@ -25,7 +25,7 @@ declare module 'motia' {
     'Advoware Proxy GET': ApiRouteHandler<Record<string, unknown>, unknown, never>
     'Advoware Proxy DELETE': ApiRouteHandler<Record<string, unknown>, unknown, never>
     'Calendar Sync Event Step': EventHandler<never, never>
-    'Calendar Sync Cron Job': CronHandler<{ topic: 'calendar.sync.triggered'; data: never }>
-    'Calendar Sync API Trigger': ApiRouteHandler<Record<string, unknown>, unknown, { topic: 'calendar.sync.triggered'; data: never }>
+    'Calendar Sync Cron Job': CronHandler<{ topic: 'calendar_sync_employee'; data: never }>
+    'Calendar Sync API Trigger': ApiRouteHandler<Record<string, unknown>, unknown, { topic: 'calendar_sync_employee'; data: never }>
   }
 }
\ No newline at end of file