diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx
index 208726bbbf1..a211c03acb8 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx
@@ -109,10 +109,13 @@ export const TransactionReviewModalContent = ({
         precomposedTx,
     });
 
-    // for bump fee we have to analyze tx data which are in outputs[0]
+    // for bump fee we have to analyze tx data which are in outputs[0], for legacy in outputs[1]
     const stakeType = isStakeForm(precomposedForm)
         ? precomposedForm.stakeType
-        : getTxStakeNameByDataHex(outputs[0]?.value);
+        : outputs
+              .filter(output => output.type === 'data')
+              .map(output => getTxStakeNameByDataHex(output?.value))
+              .find(type => type) || null;
 
     const onCancel = () => {
         if (isRbfConfirmedError) {
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx
index 72f8d3d5614..b663001782b 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx
@@ -179,6 +179,16 @@ const getOutputLines = (
                 },
             ];
         case 'regular_legacy':
+            if (stakeType) {
+                return [
+                    {
+                        id: 'data',
+                        type: 'default',
+                        value,
+                    },
+                ];
+            }
+
             return [
                 {
                     id: type,
@@ -258,7 +268,7 @@ export const TransactionReviewOutput = ({
             return {
                 ...line,
                 type:
-                    isTrading || relevantAccounts.length > 0
+                    isTrading || stakeType || relevantAccounts.length > 0
                         ? ('safe-address' as OutputElementLine['type'])
                         : line.type,
             };