diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/TokenAddressesConverter.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/TokenAddressesConverter.kt
index e4e55b8ca6..bb7e90cba1 100644
--- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/TokenAddressesConverter.kt
+++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/TokenAddressesConverter.kt
@@ -2,7 +2,9 @@ package com.tangem.data.managetokens.utils
 
 import com.tangem.blockchain.blockchains.cardano.CardanoTokenAddressConverter
 import com.tangem.blockchain.blockchains.hedera.HederaTokenAddressConverter
+import com.tangem.blockchain.blockchains.stellar.StellarTokenAddressConverter
 import com.tangem.blockchain.blockchains.sui.SuiTokenAddressConverter
+import com.tangem.blockchain.blockchains.xrp.XrpTokenAddressConverter
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.utils.toBlockchain
 import com.tangem.domain.models.network.Network
@@ -10,6 +12,8 @@ import com.tangem.domain.models.network.Network
 internal class TokenAddressesConverter {
     private val hederaTokenAddressConverter = HederaTokenAddressConverter()
     private val cardanoTokenAddressConverter = CardanoTokenAddressConverter()
+    private val xrpTokenAddressConverter = XrpTokenAddressConverter()
+    private val stellarTokenAddressConverter = StellarTokenAddressConverter()
     private val suiTokenAddressConverter = SuiTokenAddressConverter()
 
     fun convertTokenAddress(networkId: Network.ID, contractAddress: String, symbol: String?): String {
@@ -20,6 +24,11 @@ internal class TokenAddressesConverter {
             Blockchain.Sui,
             Blockchain.SuiTestnet,
             -> suiTokenAddressConverter.normalizeAddress(contractAddress)
+            Blockchain.Stellar,
+            Blockchain.StellarTestnet,
+            -> stellarTokenAddressConverter.normalizeAddress(contractAddress)
+            Blockchain.XRP,
+            -> xrpTokenAddressConverter.normalizeAddress(contractAddress)
             Blockchain.Cardano -> {
                 // TODO: [REDACTED_JIRA]
                 cardanoTokenAddressConverter.convertToFingerprint(contractAddress, symbol)