diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
index 13dcd79a67..54f468860b 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
@@ -4,7 +4,6 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.IconsUtil
 import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
 import com.tangem.domain.common.extensions.toCoinId
-import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrency.ID
 import com.tangem.domain.tokens.model.Network
@@ -55,8 +54,7 @@ internal fun getTokenIconUrl(blockchain: Blockchain, token: SdkToken): String? {
 internal fun getCoinIconUrl(blockchain: Blockchain): String? {
     val coinId = when (blockchain) {
         Blockchain.Unknown -> null
-        Blockchain.TerraV1, Blockchain.TerraV2, Blockchain.Near -> blockchain.toCoinId()
-        else -> blockchain.toNetworkId()
+        else -> blockchain.toCoinId()
     }
 
     return coinId?.let(::getTokenIconUrlFromDefaultHost)
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
index 46ace65b78..90d0ca8442 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
@@ -785,9 +785,14 @@ internal class SwapInteractorImpl @Inject constructor(
                 userWalletId = userWalletId,
                 cryptoCurrency = fromToken.currency,
             ).firstOrNull()
-            txFeeResult?.getOrNull()?.let { txFee ->
-                return txFee.toTxFeeState(networkId)
-            }
+            return txFeeResult?.fold(
+                ifLeft = {
+                    TxFeeState.Empty
+                },
+                ifRight = { txFee ->
+                    txFee.toTxFeeState(networkId)
+                }
+            ) ?: TxFeeState.Empty
         }
         return TxFeeState.Empty
     }
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
index 41287a8bc6..cfd88bd3c6 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
@@ -295,7 +295,7 @@ internal class SwapViewModel @Inject constructor(
     }
 
     private fun updateLoadedQuotes(state: Map<SwapProvider, SwapState>): Pair<SwapProvider, SwapState> {
-        val selectedSwapProvider = dataState.selectedProvider ?: state.keys.first()
+        val selectedSwapProvider = selectProvider(state)
         dataState = dataState.copy(
             selectedProvider = selectedSwapProvider,
             lastLoadedSwapStates = state,
@@ -303,6 +303,15 @@ internal class SwapViewModel @Inject constructor(
         return state.entries.first { it.key == selectedSwapProvider }.toPair()
     }
 
+    private fun selectProvider(state: Map<SwapProvider, SwapState>): SwapProvider {
+        val currentSelected = dataState.selectedProvider
+        return if (currentSelected != null && state.keys.contains(currentSelected)) {
+            currentSelected
+        } else {
+            state.keys.first()
+        }
+    }
+
     private fun fillLoadedDataState(
         state: SwapState.QuotesLoadedState,
         permissionState: PermissionDataState,