diff --git a/packages/suite/src/hooks/wallet/trading/form/useTradingExchangeForm.ts b/packages/suite/src/hooks/wallet/trading/form/useTradingExchangeForm.ts
index 67516fd6f44..507dc23d73f 100644
--- a/packages/suite/src/hooks/wallet/trading/form/useTradingExchangeForm.ts
+++ b/packages/suite/src/hooks/wallet/trading/form/useTradingExchangeForm.ts
@@ -638,18 +638,22 @@ export const useTradingExchangeForm = ({
             return;
         }
 
-        const quote = { ...selectedQuote };
-        quote.signature = signature;
-        quote.status = 'SIGN_DATA';
+        const trade = { ...selectedQuote };
+        trade.signature = signature;
+        trade.status = 'SIGN_DATA';
+
+        if (!trade.receiveAddress) {
+            return;
+        }
 
         dispatch(
             tradingExchangeActions.saveTrade(
-                quote,
+                trade,
                 selectedAccount.account,
                 new Date().toISOString(),
             ),
         );
-        confirmTrade(quote.receiveAddress || '', undefined, quote);
+        confirmTrade(trade.receiveAddress, undefined, trade);
     };
 
     const goToOffers = async () => {
diff --git a/packages/suite/src/views/wallet/trading/common/TradingSelectedOffer/TradingOfferExchange/TradingOfferExchangeSendApproval.tsx b/packages/suite/src/views/wallet/trading/common/TradingSelectedOffer/TradingOfferExchange/TradingOfferExchangeSendApproval.tsx
index ad4671deebc..b71ba4f61a5 100644
--- a/packages/suite/src/views/wallet/trading/common/TradingSelectedOffer/TradingOfferExchange/TradingOfferExchangeSendApproval.tsx
+++ b/packages/suite/src/views/wallet/trading/common/TradingSelectedOffer/TradingOfferExchange/TradingOfferExchangeSendApproval.tsx
@@ -107,12 +107,7 @@ export const TradingOfferExchangeSendApproval = () => {
 
         if (selectedQuote.approvalType) {
             updatedSelectedQuote.approvalType = undefined;
-            dispatch(
-                saveSelectedQuote({
-                    ...selectedQuote,
-                    approvalType: undefined,
-                }),
-            );
+            dispatch(saveSelectedQuote(updatedSelectedQuote));
         }
 
         await confirmTrade(dexTx.from, undefined, updatedSelectedQuote);