diff --git a/src/main/java/org/folio/search/integration/KafkaMessageListener.java b/src/main/java/org/folio/search/integration/KafkaMessageListener.java
index cbda0c025..7c6315b0c 100644
--- a/src/main/java/org/folio/search/integration/KafkaMessageListener.java
+++ b/src/main/java/org/folio/search/integration/KafkaMessageListener.java
@@ -214,7 +214,10 @@ private void indexResources(List<ResourceEvent> batch, Consumer<List<ResourceEve
 
     for (var entry : batchByTenant.entrySet()) {
       folioMessageBatchProcessor.consumeBatchWithFallback(entry.getValue(), KAFKA_RETRY_TEMPLATE_NAME,
-        executionService.executeSystemUserScoped(entry.getKey(), () -> indexConsumer),
+        events -> executionService.executeSystemUserScoped(entry.getKey(), () -> {
+          indexConsumer.accept(events);
+          return null;
+        }),
         KafkaMessageListener::logFailedEvent);
     }
   }