diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index c621cbe3c..2d536f4a1 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -545,7 +545,7 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
        * minumum amount for the swap and returns changelly
        * but rango's actual minimum is a lot lower than changelly's
        */
-      if (quotes.length === 1) {
+      if (quotes.length === 1 && props.network.name === NetworkNames.Solana) {
         errors.value.inputAmount = `Minimum amount may be lower than: ~${fromT.toReadable(
           lowestMinimum,
         )} ${nativeSwapToken.value!.token.symbol}`;
@@ -562,8 +562,8 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
       )} ${nativeSwapToken.value!.token.symbol}`;
     } else if (smallestNativeFees.gt(remainingBalance)) {
       // Can't afford the fees
-      errors.value.inputAmount = `Insufficient Bridging fees: ~${nativeSwapToken
-        .value!.toReadable(smallestNativeFees)
+      errors.value.inputAmount = `Insufficient Bridging fees: ~${fromT
+        .toReadable(smallestNativeFees)
         .substring(0, 10)} ${nativeSwapToken.value!.token.symbol} required`;
     }
 
diff --git a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
index 83090a272..dfb84bb60 100644
--- a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
+++ b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
@@ -477,7 +477,6 @@ const selectFee = (option: GasPriceTypes) => {
 };
 
 const selectTrade = (trade: ProviderSwapResponse) => {
-  console.log(trade.provider);
   pickedTrade.value = trade;
   setTransactionFees();
 };
diff --git a/packages/swap/src/providers/changelly/index.ts b/packages/swap/src/providers/changelly/index.ts
index 44e60600c..0c1747580 100644
--- a/packages/swap/src/providers/changelly/index.ts
+++ b/packages/swap/src/providers/changelly/index.ts
@@ -597,7 +597,7 @@ class Changelly extends ProviderClass {
       try {
         networkFeeBase = toBase(
           firstChangellyFixRateQuote.networkFee,
-          options.toToken.decimals,
+          options.fromToken.decimals,
         );
       } catch (err) {
         console.warn(
@@ -628,10 +628,9 @@ class Changelly extends ProviderClass {
           `  options.toToken.address=${options.toToken.address}`,
         );
       }
-
       const providerQuoteResponse: ProviderQuoteResponse = {
         fromTokenAmount: quoteRequestAmount,
-        additionalNativeFees: toBN(firstChangellyFixRateQuote.networkFee),
+        additionalNativeFees: toBN(networkFeeBase),
         toTokenAmount: toBN(toTokenAmountBase).sub(toBN(networkFeeBase)),
         provider: this.name,
         quote: {