diff --git a/lib/exchange/changenow/changenow_exchange_provider.dart b/lib/exchange/changenow/changenow_exchange_provider.dart
index b1b34d8e1..c004f327a 100644
--- a/lib/exchange/changenow/changenow_exchange_provider.dart
+++ b/lib/exchange/changenow/changenow_exchange_provider.dart
@@ -191,7 +191,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
         inputAddress: inputAddress,
         amount: expectedSendAmount,
         state: state,
-        extraId: extraId.isNotEmpty ? extraId : null,
+        extraId: extraId,
         expiredAt: expiredAt,
         outputTransaction: outputTransaction);
   }
diff --git a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
index c6cb6fc83..ec500b66a 100644
--- a/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
+++ b/lib/exchange/simpleswap/simpleswap_exchange_provider.dart
@@ -106,7 +106,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
     final id = responseJSON['id'] as String;
     final inputAddress = responseJSON['address_from'] as String;
     final settleAddress = responseJSON['user_refund_address'] as String;
-    final extraIdTo = responseJSON['extraIdTo'] as String;
+    final extraId = responseJSON['extra_id_from'] as String;
     return Trade(
       id: id,
       provider: description,
@@ -114,7 +114,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
       to: _request.to,
       inputAddress: inputAddress,
       refundAddress: settleAddress,
-      extraId: extraIdTo,
+      extraId: extraId,
       state: TradeState.created,
       amount: _request.amount,
       createdAt: DateTime.now(),
@@ -181,6 +181,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
     final to = CryptoCurrency.fromString(toCurrency);
     final inputAddress = responseJSON['address_from'] as String;
     final expectedSendAmount = responseJSON['expected_amount'].toString();
+    final extraId = responseJSON['extra_id_from'] as String;
     final status = responseJSON['status'] as String;
     final state = TradeState.deserialize(raw: status);
 
@@ -188,6 +189,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
       id: id,
       from: from,
       to: to,
+      extraId: extraId,
       provider: description,
       inputAddress: inputAddress,
       amount: expectedSendAmount,