diff --git a/apps/api/src/services/awooop_ansible_check_mode_service.py b/apps/api/src/services/awooop_ansible_check_mode_service.py
index d2cc812de..ba7ecaed1 100644
--- a/apps/api/src/services/awooop_ansible_check_mode_service.py
+++ b/apps/api/src/services/awooop_ansible_check_mode_service.py
@@ -9781,7 +9781,7 @@ async def claim_stale_pending_check_modes(
                       ) <= NOW() - (:stale_after_seconds * INTERVAL '1 second')
                 ORDER BY check_mode.created_at DESC
                 LIMIT :limit
-                FOR UPDATE SKIP LOCKED
+                FOR UPDATE OF check_mode SKIP LOCKED
             """),
             {
                 "limit": max(1, limit),
diff --git a/apps/api/tests/test_host_disk_pressure_ansible_catalog.py b/apps/api/tests/test_host_disk_pressure_ansible_catalog.py
index 41bab563f..380fef563 100644
--- a/apps/api/tests/test_host_disk_pressure_ansible_catalog.py
+++ b/apps/api/tests/test_host_disk_pressure_ansible_catalog.py
@@ -181,6 +181,7 @@ def test_historical_catalog_replay_is_per_failed_row_and_provider_silent() -> No
     assert '"historical_projection_backfill": True' in claim_source
     assert '"telegram_provider_delivery": "shadow_only"' in claim_source
     assert "check_mode.tags" in stale_source
+    assert "FOR UPDATE OF check_mode SKIP LOCKED" in stale_source
     assert "telegram_provider_delivery" in send_source