diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
index 11ecd2b7e..2ffb94294 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -391,7 +391,7 @@
                 </div>
               }
             }
-            @if (cashappEnabled) {
+            @if (canPayWithCashapp) {
               <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
                 <p>Pay <app-fiat [value]="cost"></app-fiat> with</p>
                 <img class="paymentMethod mx-2" src="/resources/cash-app.svg" height=55 (click)="moveToStep('cashapp')">
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
index 6a20f6ff7..c69da8524 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -466,7 +466,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   }
 
   get canPayWithCashapp() {
-    return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp');
+    return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp') && this.cost < 400000;
   }
 
   get canPayWithBalance() {
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index 6bb0950b5..a0f242d46 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -120,7 +120,7 @@
           <div class="spinner-border text-light" style="width: 1em; height: 1em"></div>
         </div>
         <span class="explainer">&nbsp;</span>
-      } @else if (showAccelerationSummary && !accelerationFlowCompleted) {
+      } @else if (showAccelerationSummary) {
         <ng-container *ngIf="(ETA$ | async) as eta;">
           <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
         </ng-container>
diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index 397f98805..57eecee16 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -386,18 +386,19 @@ export class TrackerComponent implements OnInit, OnDestroy {
           }
 
           if (!this.mempoolPosition.accelerated) {
-            if (!this.showAccelerationSummary) {
+            if (!this.accelerationFlowCompleted && !this.showAccelerationSummary && this.mempoolPosition.block > 0) {
               this.showAccelerationSummary = true;
               this.miningService.getMiningStats('1w').subscribe(stats => {
                 this.miningStats = stats;
               });
             }
-            if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
+            if (txPosition.position?.block > 0) {
               this.accelerationEligible = true;
             }
           } else if (this.showAccelerationSummary) {
             setTimeout(() => {
               this.accelerationFlowCompleted = true;
+              this.showAccelerationSummary = false;
             }, 2000);
           }
         }
@@ -742,6 +743,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
       return;
     }
     this.enterpriseService.goal(8);
+    this.accelerationFlowCompleted = false;
     this.showAccelerationSummary = true && this.acceleratorAvailable;
     this.scrollIntoAccelPreview = true;
     return false;
@@ -777,6 +779,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
     this.auditStatus = null;
     this.accelerationPositions = null;
     this.accelerationEligible = false;
+    this.accelerationFlowCompleted = false;
     this.trackerStage = 'waiting';
     document.body.scrollTo(0, 0);
     this.leaveTransaction();
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 4a56f2c99..eecae86f7 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -540,9 +540,9 @@
             @if (eta.blocks >= 7) {
               <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') ? 'etaDeepMempool d-flex justify-content-end align-items-center' : ''">
                 <span i18n="transaction.eta.in-several-hours|Transaction ETA in several hours or more">In several hours (or more)</span>
-                <!-- @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') {
+                @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary) {
                   <a class="btn btn-sm accelerateDeepMempool btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
-                } -->
+                }
               </span>
             } @else if (network === 'liquid' || network === 'liquidtestnet') {
               <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 74f49c69b..0f86701ff 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -139,6 +139,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   acceleratorAvailable: boolean = this.stateService.env.ACCELERATOR && this.stateService.network === '';
   showAccelerationSummary = false;
   showAccelerationDetails = false;
+  accelerationFlowCompleted = false;
   scrollIntoAccelPreview = false;
   accelerationEligible = false;
   auditEnabled: boolean = this.stateService.env.AUDIT && this.stateService.env.BASE_MODULE === 'mempool' && this.stateService.env.MINING_DASHBOARD === true;
@@ -409,7 +410,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
           }
 
           if (!this.mempoolPosition.accelerated) {
-            if (!this.showAccelerationSummary) {
+            if (!this.accelerationFlowCompleted && !this.showAccelerationSummary) {
               this.showAccelerationSummary = true;
               this.miningService.getMiningStats('1w').subscribe(stats => {
                 this.miningStats = stats;
@@ -420,6 +421,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
             }
           } else if (this.showAccelerationSummary) {
             setTimeout(() => {
+              this.accelerationFlowCompleted = true;
               this.showAccelerationSummary = false;
             }, 2000);
           }
@@ -709,6 +711,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
 
     document.location.hash = '#accelerate';
     this.enterpriseService.goal(8);
+    this.accelerationFlowCompleted = false;
     this.showAccelerationSummary = true && this.acceleratorAvailable;
     this.scrollIntoAccelPreview = true;
     return false;
@@ -789,9 +792,11 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     this.isAcceleration = (this.tx.acceleration || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id))));
     if (this.isAcceleration) {
       if (initialState) {
+        this.accelerationFlowCompleted = true;
         this.showAccelerationSummary = false;
       } else if (this.showAccelerationSummary) {
         setTimeout(() => {
+          this.accelerationFlowCompleted = true;
           this.showAccelerationSummary = false;
         }, 2000);
       }
@@ -864,6 +869,8 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     this.filters = [];
     this.showCpfpDetails = false;
     this.accelerationInfo = null;
+    this.accelerationEligible = false;
+    this.accelerationFlowCompleted = false;
     this.txInBlockIndex = null;
     this.mempoolPosition = null;
     this.pool = null;