diff --git a/lib/services/mixins/electrum_x_parsing.dart b/lib/services/mixins/electrum_x_parsing.dart
index c313a91eb..92cf86305 100644
--- a/lib/services/mixins/electrum_x_parsing.dart
+++ b/lib/services/mixins/electrum_x_parsing.dart
@@ -148,19 +148,31 @@ mixin ElectrumXParsing {
       type = TransactionType.outgoing;
       amount = amountSentFromWallet - changeAmount - fee;
 
-      final possible =
-          outputAddresses.difference(myChangeReceivedOnAddresses).first;
+      // non wallet addresses found in tx outputs
+      final nonWalletOutAddresses = outputAddresses.difference(
+        myChangeReceivedOnAddresses,
+      );
 
-      if (transactionAddress.value != possible) {
-        transactionAddress = Address(
-          walletId: walletId,
-          value: possible,
-          derivationIndex: -1,
-          derivationPath: null,
-          subType: AddressSubType.nonWallet,
-          type: AddressType.nonWallet,
-          publicKey: [],
-        );
+      if (nonWalletOutAddresses.isNotEmpty) {
+        final possible = nonWalletOutAddresses.first;
+
+        if (transactionAddress.value != possible) {
+          transactionAddress = Address(
+            walletId: walletId,
+            value: possible,
+            derivationIndex: -1,
+            derivationPath: null,
+            subType: AddressSubType.nonWallet,
+            type: AddressType.nonWallet,
+            publicKey: [],
+          );
+        }
+      } else {
+        // some other type of tx where the receiving address is
+        // one of my change addresses
+
+        type = TransactionType.sentToSelf;
+        amount = changeAmount;
       }
     } else {
       // incoming tx