diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt
index 83a62fc380..23781967f0 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt
@@ -17,5 +17,5 @@ fun SelectTokenNetworkDialog(dialog: DomainDialog.SelectTokenDialog, onDismissRe
         items = dialog.items,
         onSelect = dialog.onSelect,
         onDismissRequest = onDismissRequest
-    ) { network -> TitleSubtitle(dialog.networkIdConverter(network.networkId), network.address ?: "") }
+    ) { network -> TitleSubtitle(dialog.networkIdConverter(network.networkId), network.contractAddress ?: "") }
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt
index cf5ab1ceb3..fc3b5891ef 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt
@@ -22,8 +22,8 @@ class AddCustomTokenService(
                 var coinsList = mutableListOf<CoinsResponse.Coin>()
                 result.data.coins.forEach { coin ->
                     val networksWithTheSameAddress = coin.networks
-                        .filter { it.address != null || it.decimalCount != null }
-                        .filter { it.address == contractAddress }
+                        .filter { it.contractAddress != null || it.decimalCount != null }
+                        .filter { it.contractAddress == contractAddress }
                     if (networksWithTheSameAddress.isNotEmpty()) {
                         val newToken = coin.copy(networks = networksWithTheSameAddress)
                         coinsList.add(newToken)
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
index 61e933ed7c..c526237f5a 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
@@ -63,10 +63,12 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
 
                 when (val error = ContractAddress.validateValue(address)) {
                     null -> {
-                        // valid contract
+                        // valid contract address
                         ContractAddress.removeError()
                         updateTokenDetailFields(false)
                         changeBlockchainNetworkList()
+                        checkAndUpdateAddButton()
+                        manageFoundTokenChanges(requestInfoAboutToken(address))
                     }
                     AddCustomTokenError.FieldIsEmpty -> {
                         // empty contract address
@@ -75,23 +77,14 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
                         updateTokenDetailFields(false)
                         changeBlockchainNetworkList()
                         checkAndUpdateAddButton()
-                        return
                     }
                     AddCustomTokenError.InvalidContractAddress -> {
                         ContractAddress.addError(error)
                         updateTokenDetailFields(hubState.tokensAnyFieldsIsFilled())
                         changeBlockchainNetworkList()
                         checkAndUpdateAddButton()
-                        return
                     }
-                    else -> {}
                 }
-                if (!action.contractAddress.isUserInput) {
-                    checkAndUpdateAddButton()
-                    return
-                }
-
-                manageFoundTokenChanges(requestInfoAboutToken(address))
             }
             is OnTokenNetworkChanged -> {
                 if (!action.blockchainNetwork.isUserInput) return
diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt b/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt
index d5c4644c6e..8a036da146 100644
--- a/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt
+++ b/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt
@@ -24,7 +24,7 @@ data class CoinsResponse(
 
         data class Network(
             val networkId: String,
-            val address: String? = null,
+            val contractAddress: String? = null,
             val decimalCount: BigDecimal? = null,
         ) : TangemTechResponse
     }