diff --git a/packages/relayer/indexer/handle_event.go b/packages/relayer/indexer/handle_event.go
index d5f580ac47..8052cce0d3 100644
--- a/packages/relayer/indexer/handle_event.go
+++ b/packages/relayer/indexer/handle_event.go
@@ -23,6 +23,17 @@ func (i *Indexer) handleEvent(
 ) error {
 	slog.Info("event found for msgHash", "msgHash", common.Hash(event.MsgHash).Hex(), "txHash", event.Raw.TxHash.Hex())
 
+	if event.Message.DestChainId.Cmp(i.destChainId) != 0 {
+		slog.Info("skipping event, wrong chainID",
+			"messageDestChainID",
+			event.Message.DestChainId.Uint64(),
+			"indexerDestChainID",
+			i.destChainId.Uint64(),
+		)
+
+		return nil
+	}
+
 	if err := i.detectAndHandleReorg(ctx, relayer.EventNameMessageSent, common.Hash(event.MsgHash).Hex()); err != nil {
 		return errors.Wrap(err, "svc.detectAndHandleReorg")
 	}
@@ -71,7 +82,6 @@ func (i *Indexer) handleEvent(
 		return errors.Wrap(err, "svc.eventRepo.Save")
 	}
 
-	// TODO: add to queue
 	msg := queue.QueueMessageBody{
 		ID:    e.ID,
 		Event: event,
diff --git a/packages/relayer/mock/bridge.go b/packages/relayer/mock/bridge.go
index 245536be57..5b198241db 100644
--- a/packages/relayer/mock/bridge.go
+++ b/packages/relayer/mock/bridge.go
@@ -60,7 +60,8 @@ func (b *Bridge) WatchMessageSent(
 
 		sink <- &bridge.BridgeMessageSent{
 			Message: bridge.IBridgeMessage{
-				SrcChainId: big.NewInt(1),
+				SrcChainId:  big.NewInt(1),
+				DestChainId: MockChainID,
 			},
 		}
 		b.MessagesSent++