diff --git a/lib/services/coins/bitcoin/bitcoin_wallet.dart b/lib/services/coins/bitcoin/bitcoin_wallet.dart
index 3e34891a7..b79be69f1 100644
--- a/lib/services/coins/bitcoin/bitcoin_wallet.dart
+++ b/lib/services/coins/bitcoin/bitcoin_wallet.dart
@@ -440,7 +440,7 @@ class BitcoinWallet extends CoinServiceAPI with WalletCache, WalletDB {
           // reset counter
           gapCounter = 0;
           // add info to derivations
-          derivations[node["address"] as String] = {
+          derivations[address.value] = {
             "pubKey": Format.uint8listToString(
                 (node["node"] as bip32.BIP32).publicKey),
             "wif": (node["node"] as bip32.BIP32).toWIF(),
diff --git a/lib/services/coins/bitcoincash/bitcoincash_wallet.dart b/lib/services/coins/bitcoincash/bitcoincash_wallet.dart
index 65d6190ac..55e89d53b 100644
--- a/lib/services/coins/bitcoincash/bitcoincash_wallet.dart
+++ b/lib/services/coins/bitcoincash/bitcoincash_wallet.dart
@@ -427,7 +427,7 @@ class BitcoinCashWallet extends CoinServiceAPI with WalletCache, WalletDB {
           // reset counter
           gapCounter = 0;
           // add info to derivations
-          derivations[node["address"] as String] = {
+          derivations[address.value] = {
             "pubKey": Format.uint8listToString(
                 (node["node"] as bip32.BIP32).publicKey),
             "wif": (node["node"] as bip32.BIP32).toWIF(),
diff --git a/lib/services/coins/litecoin/litecoin_wallet.dart b/lib/services/coins/litecoin/litecoin_wallet.dart
index ae3847975..c403743a9 100644
--- a/lib/services/coins/litecoin/litecoin_wallet.dart
+++ b/lib/services/coins/litecoin/litecoin_wallet.dart
@@ -457,7 +457,7 @@ class LitecoinWallet extends CoinServiceAPI with WalletCache, WalletDB {
           // reset counter
           gapCounter = 0;
           // add info to derivations
-          derivations[node["address"] as String] = {
+          derivations[address.value] = {
             "pubKey": Format.uint8listToString(
                 (node["node"] as bip32.BIP32).publicKey),
             "wif": (node["node"] as bip32.BIP32).toWIF(),
diff --git a/lib/services/coins/namecoin/namecoin_wallet.dart b/lib/services/coins/namecoin/namecoin_wallet.dart
index 37bc57d87..2a158b9c4 100644
--- a/lib/services/coins/namecoin/namecoin_wallet.dart
+++ b/lib/services/coins/namecoin/namecoin_wallet.dart
@@ -447,7 +447,7 @@ class NamecoinWallet extends CoinServiceAPI with WalletCache, WalletDB {
           // reset counter
           gapCounter = 0;
           // add info to derivations
-          derivations[node["address"] as String] = {
+          derivations[address.value] = {
             "pubKey": Format.uint8listToString(
                 (node["node"] as bip32.BIP32).publicKey),
             "wif": (node["node"] as bip32.BIP32).toWIF(),
diff --git a/lib/services/coins/particl/particl_wallet.dart b/lib/services/coins/particl/particl_wallet.dart
index f7b941fa1..13ebe4c59 100644
--- a/lib/services/coins/particl/particl_wallet.dart
+++ b/lib/services/coins/particl/particl_wallet.dart
@@ -430,7 +430,7 @@ class ParticlWallet extends CoinServiceAPI with WalletCache, WalletDB {
           // reset counter
           gapCounter = 0;
           // add info to derivations
-          derivations[node["address"] as String] = {
+          derivations[address.value] = {
             "pubKey": Format.uint8listToString(
                 (node["node"] as bip32.BIP32).publicKey),
             "wif": (node["node"] as bip32.BIP32).toWIF(),