diff --git a/apps/commerce-api/src/main/java/com/loopers/infrastructure/outbox/EventOutboxRepository.java b/apps/commerce-api/src/main/java/com/loopers/infrastructure/outbox/EventOutboxRepository.java
index 9cf8ff6b8..6c5a1de19 100644
--- a/apps/commerce-api/src/main/java/com/loopers/infrastructure/outbox/EventOutboxRepository.java
+++ b/apps/commerce-api/src/main/java/com/loopers/infrastructure/outbox/EventOutboxRepository.java
@@ -37,7 +37,7 @@ public interface EventOutboxRepository extends JpaRepository<EventOutboxEntity,
        set e.status = 'READY',
            e.processingStartedAt = null,
            e.nextRetryAt = :now
-     where e.status = 'PROCESSING'
+     where e.status = 'PENDING'
        and e.processingStartedAt < :stuckBefore
     """)
     int recoverStuckPending(@Param("stuckBefore") Instant stuckBefore,
diff --git a/apps/commerce-streamer/src/test/java/com/loopers/application/idempotency/EventHandledServiceTest.java b/apps/commerce-streamer/src/test/java/com/loopers/application/idempotency/EventHandledServiceTest.java
index fbd17d2b6..2a48eb6f0 100644
--- a/apps/commerce-streamer/src/test/java/com/loopers/application/idempotency/EventHandledServiceTest.java
+++ b/apps/commerce-streamer/src/test/java/com/loopers/application/idempotency/EventHandledServiceTest.java
@@ -48,7 +48,7 @@ void duplicate_message_should_be_applied_once() throws Exception {
         long after = metricsRepo.findById(productId).orElseThrow().getLikeCount();
         assertThat(after).isEqualTo(before + 1);
 
-        long handledCount = handledRepo.countByConsumerNameAndEventId("product-like-metrics", "e-123");
+        long handledCount = handledRepo.countByConsumerNameAndEventId("product-like-metrics", "06b9f00c-04bb-40fb-a96c-a9da5d0ede53");
         assertThat(handledCount).isEqualTo(1);
     }