diff --git a/src/bot.ts b/src/bot.ts
index 9fd58c17f5cacaab72d23f3dcd988a9b17749775..bbf3ddd2339d27b62e7e28d9cb8e3ebcc1816222 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -103,10 +103,14 @@ export class WorkerBee implements IWorkerBee {
 
         const listener = txObserver.provideBlockHeaderData().subscribe({
           next(val) {
-            observer.next?.({
-              transaction: val.transactions[apiTx.id]!,
-              block: val.block
-            });
+            const transaction = val.transactions[txId] ?? val.transactions[legacyId]!;
+            if( transaction!== undefined) {
+              listener.unsubscribe();
+              observer.next?.({
+                transaction,
+                block: val.block
+              });
+            }
           },
           error(val) {
             observer.error?.(val);