diff --git a/blockchain-watcher/src/domain/actions/solana/HandleSolanaTransactions.ts b/blockchain-watcher/src/domain/actions/solana/HandleSolanaTransactions.ts
index ffb1e001..d77a80e6 100644
--- a/blockchain-watcher/src/domain/actions/solana/HandleSolanaTransactions.ts
+++ b/blockchain-watcher/src/domain/actions/solana/HandleSolanaTransactions.ts
@@ -6,13 +6,13 @@ import { solana } from "../../entities";
  */
 export class HandleSolanaTransactions<T> {
   cfg: HandleSolanaTxConfig;
-  mapper: (txs: solana.Transaction, args: { programId: string }) => Promise<T>;
+  mapper: (txs: solana.Transaction, args: { programId: string }) => Promise<T[]>;
   target?: (parsed: T[]) => Promise<void>;
   logger: winston.Logger = winston.child({ module: "HandleSolanaTransaction" });
 
   constructor(
     cfg: HandleSolanaTxConfig,
-    mapper: (txs: solana.Transaction) => Promise<T>,
+    mapper: (txs: solana.Transaction) => Promise<T[]>,
     target?: (parsed: T[]) => Promise<void>
   ) {
     this.cfg = cfg;
@@ -33,7 +33,7 @@ export class HandleSolanaTransactions<T> {
     let mappedItems: T[] = [];
     for (const tx of filteredItems) {
       const result = await this.mapper(tx, { programId: this.cfg.programId });
-      if (result) {
+      if (result.length) {
         mappedItems = mappedItems.concat(result);
       }
     }
diff --git a/blockchain-watcher/src/domain/actions/solana/PollSolanaTransactions.ts b/blockchain-watcher/src/domain/actions/solana/PollSolanaTransactions.ts
index 5ba663a4..a52cc3c0 100644
--- a/blockchain-watcher/src/domain/actions/solana/PollSolanaTransactions.ts
+++ b/blockchain-watcher/src/domain/actions/solana/PollSolanaTransactions.ts
@@ -81,7 +81,7 @@ export class PollSolanaTransactions extends RunPollingJob {
         this.cfg.signaturesLimit
       );
       this.logger.debug(
-        `Got ${sigs.length} signatures for address ${this.cfg.programId} between ${fromBlock.blockTime} and ${toBlock.blockTime}`
+        `Got ${sigs.length} signatures for address ${this.cfg.programId} between sigs ${afterSignature} and ${beforeSignature} [slots: ${range.fromSlot} - ${range.toSlot}]`
       );
 
       const txs = await this.slotRepository.getTransactions(sigs);
@@ -101,7 +101,7 @@ export class PollSolanaTransactions extends RunPollingJob {
   }
 
   private getSlotRange(latestSlot: number): { fromSlot: number; toSlot: number } {
-    let fromSlot = this.slotCursor ? this.slotCursor + 1 : (this.cfg.fromSlot ?? latestSlot);
+    let fromSlot = this.slotCursor ? this.slotCursor + 1 : this.cfg.fromSlot ?? latestSlot;
     // cfg.fromSlot is present and is greater than current slot height, then we allow to skip slots.
     if (this.slotCursor && this.cfg.fromSlot && this.cfg.fromSlot > this.slotCursor) {
       fromSlot = this.cfg.fromSlot;
@@ -114,7 +114,9 @@ export class PollSolanaTransactions extends RunPollingJob {
     }
 
     if (fromSlot > toSlot) {
-      throw new Error(`Invalid slot range: fromSlot=${fromSlot} toSlot=${toSlot}`);
+      throw new Error(
+        `Invalid slot range: fromSlot=${fromSlot} toSlot=${toSlot}. Might be cause we are up to date.`
+      );
     }
 
     return { fromSlot, toSlot };
@@ -141,12 +143,13 @@ export class PollSolanaTransactions extends RunPollingJob {
     slot: number,
     nextSlot: (slot: number) => number
   ): Promise<solana.Block> {
-    const blockResult = await this.slotRepository.getBlock(slot);
+    const blockResult = await this.slotRepository.getBlock(slot, this.cfg.commitment);
     if (blockResult.isOk()) {
       return Promise.resolve(blockResult.getValue());
     }
 
     if (blockResult.getError().skippedSlot() || blockResult.getError().noBlockOrBlockTime()) {
+      this.logger.warn(`No block found for slot ${slot}, trying next slot ${nextSlot(slot)}`);
       return this.findValidBlock(nextSlot(slot), nextSlot);
     }
 
diff --git a/blockchain-watcher/src/domain/repositories.ts b/blockchain-watcher/src/domain/repositories.ts
index a2a42303..8e6969d7 100644
--- a/blockchain-watcher/src/domain/repositories.ts
+++ b/blockchain-watcher/src/domain/repositories.ts
@@ -18,7 +18,7 @@ export interface EvmBlockRepository {
 
 export interface SolanaSlotRepository {
   getLatestSlot(commitment: string): Promise<number>;
-  getBlock(slot: number): Promise<Fallible<solana.Block, solana.Failure>>;
+  getBlock(slot: number, finality?: string): Promise<Fallible<solana.Block, solana.Failure>>;
   getSignaturesForAddress(
     address: string,
     beforeSig: string,
diff --git a/blockchain-watcher/src/infrastructure/repositories/Web3SolanaSlotRepository.ts b/blockchain-watcher/src/infrastructure/repositories/Web3SolanaSlotRepository.ts
index b1c6bcb7..43d8a066 100644
--- a/blockchain-watcher/src/infrastructure/repositories/Web3SolanaSlotRepository.ts
+++ b/blockchain-watcher/src/infrastructure/repositories/Web3SolanaSlotRepository.ts
@@ -4,6 +4,7 @@ import {
   PublicKey,
   VersionedTransactionResponse,
   SolanaJSONRPCError,
+  Finality,
 } from "@solana/web3.js";
 
 import { Fallible, solana } from "../../domain/entities";
@@ -20,9 +21,12 @@ export class Web3SolanaSlotRepository implements SolanaSlotRepository {
     return this.connection.getSlot(commitment as Commitment);
   }
 
-  getBlock(slot: number): Promise<Fallible<solana.Block, solana.Failure>> {
+  getBlock(slot: number, finality?: string): Promise<Fallible<solana.Block, solana.Failure>> {
     return this.connection
-      .getBlock(slot, { maxSupportedTransactionVersion: 0 })
+      .getBlock(slot, {
+        maxSupportedTransactionVersion: 0,
+        commitment: finality === "finalized" || finality === "confirmed" ? finality : undefined,
+      })
       .then((block) => {
         if (block === null) {
           return Fallible.error<solana.Block, solana.Failure>(
diff --git a/blockchain-watcher/test/domain/actions/solana/PollSolanaTransactions.test.ts b/blockchain-watcher/test/domain/actions/solana/PollSolanaTransactions.test.ts
index 0c1dcb05..267dc7e6 100644
--- a/blockchain-watcher/test/domain/actions/solana/PollSolanaTransactions.test.ts
+++ b/blockchain-watcher/test/domain/actions/solana/PollSolanaTransactions.test.ts
@@ -49,7 +49,7 @@ describe("PollSolanaTransactions", () => {
     await thenWaitForAssertion(
       () => expect(metadataGetSpy).toHaveBeenCalledWith(cfg.id),
       () => expect(getLatestSlotSpy).toHaveBeenCalledWith(cfg.commitment),
-      () => expect(getBlockSpy).toHaveBeenCalledWith(currentSlot),
+      () => expect(getBlockSpy).toHaveBeenCalledWith(currentSlot, cfg.commitment),
       () => expect(handlerSpy).toHaveBeenCalledWith(expectedTxs),
       () =>
         expect(getSigsSpy).toHaveBeenCalledWith(
@@ -80,7 +80,7 @@ describe("PollSolanaTransactions", () => {
     pollSolanaTransactions.run([handlers.working]);
 
     await thenWaitForAssertion(
-      () => expect(getBlockSpy).toHaveBeenCalledWith(lastSlot + 1),
+      () => expect(getBlockSpy).toHaveBeenCalledWith(lastSlot + 1, cfg.commitment),
       () => expect(handlerSpy).toHaveBeenCalledWith(expectedTxs),
       () =>
         expect(getSigsSpy).toHaveBeenCalledWith(