diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts
index 77b4ef1a1..87d1fb59f 100644
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -355,17 +355,9 @@ class WebsocketHandler {
         if (rbfTransactions[client['track-tx']]) {
           for (const rbfTransaction in rbfTransactions) {
             if (client['track-tx'] === rbfTransaction) {
-              const rbfTx = rbfTransactions[rbfTransaction];
-              if (config.MEMPOOL.BACKEND !== 'esplora') {
-                try {
-                  const fullTx = await transactionUtils.$getTransactionExtended(rbfTx.txid, true);
-                  response['rbfTransaction'] = fullTx;
-                } catch (e) {
-                  logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
-                }
-              } else {
-                response['rbfTransaction'] = rbfTx;
-              }
+              response['rbfTransaction'] = {
+                txid: rbfTransactions[rbfTransaction].txid,
+              };
               break;
             }
           }
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index bc33098db..4788b5657 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -235,7 +235,7 @@ export class TransactionComponent implements OnInit, OnDestroy {
     });
 
     this.txReplacedSubscription = this.stateService.txReplaced$.subscribe((rbfTransaction) => {
-      if (!rbfTransaction.size) {
+      if (!this.tx) {
         this.error = new Error();
         this.waitingForTransaction = false;
       }