diff --git a/src/dipdup/datasources/substrate_node.py b/src/dipdup/datasources/substrate_node.py
index 6d27a6913..e1b262083 100644
--- a/src/dipdup/datasources/substrate_node.py
+++ b/src/dipdup/datasources/substrate_node.py
@@ -242,12 +242,12 @@ async def get_events(self, block_hash: str) -> tuple[_SubstrateNodeEventResponse
             await asyncio.sleep(0.1)
 
         result: list[_SubstrateNodeEventResponse] = []
-        for raw_event in events:
+        for index, raw_event in enumerate(events):
             event: dict[str, Any] = raw_event.decode()
             result.append(
                 {
                     'name': f'{event["module_id"]}.{event["event_id"]}',
-                    'index': event['event_index'],
+                    'index': index,
                     'extrinsic_index': event['extrinsic_idx'],
                     'decoded_args': event['attributes'],
                 }
diff --git a/src/dipdup/indexes/substrate_events/fetcher.py b/src/dipdup/indexes/substrate_events/fetcher.py
index 7ad5e7a82..e148f03bb 100644
--- a/src/dipdup/indexes/substrate_events/fetcher.py
+++ b/src/dipdup/indexes/substrate_events/fetcher.py
@@ -173,8 +173,6 @@ async def _log_loop() -> None:
             with suppress(asyncio.TimeoutError):
                 while True:
                     header, events = await asyncio.wait_for(queues['events'].get(), timeout=1)
-                    for index in range(len(events)):
-                        events[index]['index'] = index
                     yield tuple(SubstrateEventData.from_node(event, header) for event in events)
 
         tasks[-1].cancel()