diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldSupplyMarketTokenDto.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldSupplyMarketTokenDto.kt
index a2d32540f9..d9d6264389 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldSupplyMarketTokenDto.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldSupplyMarketTokenDto.kt
@@ -10,8 +10,9 @@ data class YieldSupplyMarketTokenDto(
     @Json(name = "tokenSymbol") val tokenSymbol: String? = null,
     @Json(name = "tokenName") val tokenName: String? = null,
     @Json(name = "apy") val apy: BigDecimal? = null,
+    @Json(name = "decimals") val decimals: Int? = null,
     @Json(name = "isActive") val isActive: Boolean? = null,
     @Json(name = "chainId") val chainId: Int? = null,
-    @Json(name = "maxFeeNative") val maxFeeNative: String? = null,
-    @Json(name = "maxFeeUSD") val maxFeeUSD: String? = null,
+    @Json(name = "maxFeeNative") val maxFeeNative: BigDecimal? = null,
+    @Json(name = "maxFeeUSD") val maxFeeUSD: BigDecimal? = null,
 )
\ No newline at end of file
diff --git a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldMarketTokenConverter.kt b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldMarketTokenConverter.kt
index c66fb73edd..61d15fb639 100644
--- a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldMarketTokenConverter.kt
+++ b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldMarketTokenConverter.kt
@@ -12,8 +12,8 @@ internal object YieldMarketTokenConverter : Converter<YieldSupplyMarketTokenDto,
             apy = value.apy.orZero(),
             isActive = value.isActive ?: false,
             chainId = value.chainId ?: -1,
-            maxFeeUSD = value.maxFeeUSD.orEmpty(),
-            maxFeeNative = value.maxFeeNative.orEmpty(),
+            maxFeeUSD = value.maxFeeUSD.orZero(),
+            maxFeeNative = value.maxFeeNative.orZero(),
         )
     }
 }
\ No newline at end of file
diff --git a/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketToken.kt b/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketToken.kt
index 7d379d4af6..26ec2d1ac9 100644
--- a/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketToken.kt
+++ b/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketToken.kt
@@ -12,8 +12,8 @@ data class YieldMarketToken(
     val chainId: Int,
     val apy: SerializedBigDecimal,
     val isActive: Boolean,
-    val maxFeeNative: String,
-    val maxFeeUSD: String,
+    val maxFeeNative: SerializedBigDecimal,
+    val maxFeeUSD: SerializedBigDecimal,
     val backendId: String? = null,
 ) {
 
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetMaxFeeUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetMaxFeeUseCase.kt
index 3c8c7aa671..127029c78c 100644
--- a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetMaxFeeUseCase.kt
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetMaxFeeUseCase.kt
@@ -55,7 +55,7 @@ class YieldSupplyGetMaxFeeUseCase(
         val cachedMarketToken = yieldSupplyRepository.getCachedMarkets().orEmpty()
             .firstOrNull { it.yieldSupplyKey == token.yieldSupplyKey() }
         val marketToken = cachedMarketToken ?: yieldSupplyRepository.getTokenStatus(token)
-        val maxFeeNative = marketToken.maxFeeNative.toBigDecimal()
+        val maxFeeNative = marketToken.maxFeeNative
 
         val rateRatio = nativeFiatRate.divide(
             fiatRate,
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt
index af19fd4a55..2e90010033 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt
@@ -40,6 +40,7 @@ import com.tangem.utils.StringsSigns
 internal fun YieldSupplyBlockContent(yieldSupplyUM: YieldSupplyUM, modifier: Modifier = Modifier) {
     AnimatedContent(
         targetState = yieldSupplyUM,
+        contentKey = { it::class },
     ) { supplyUM ->
         when (supplyUM) {
             is YieldSupplyUM.Available -> SupplyAvailable(supplyUM, modifier)
@@ -118,17 +119,23 @@ private fun SupplyContent(supplyUM: YieldSupplyUM.Content, modifier: Modifier =
                     style = TangemTheme.typography.subtitle1,
                     color = TangemTheme.colors.text.primary1,
                 )
-                Text(
-                    text = StringsSigns.DOT,
-                    style = TangemTheme.typography.subtitle1,
-                    color = TangemTheme.colors.text.tertiary,
-                )
-                Text(
-                    text = supplyUM.rewardsApy.resolveReference(),
-                    style = TangemTheme.typography.subtitle1,
-                    maxLines = 1,
-                    color = TangemTheme.colors.text.accent,
-                )
+                AnimatedVisibility(supplyUM.rewardsApy != TextReference.EMPTY) {
+                    Row(
+                        horizontalArrangement = Arrangement.spacedBy(4.dp),
+                    ) {
+                        Text(
+                            text = StringsSigns.DOT,
+                            style = TangemTheme.typography.subtitle1,
+                            color = TangemTheme.colors.text.tertiary,
+                        )
+                        Text(
+                            text = supplyUM.rewardsApy.resolveReference(),
+                            style = TangemTheme.typography.subtitle1,
+                            maxLines = 1,
+                            color = TangemTheme.colors.text.accent,
+                        )
+                    }
+                }
             }
             Text(
                 text = supplyUM.subtitle.resolveReference(),
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
index 09949a382e..f9567b4be5 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
@@ -11,7 +11,6 @@ import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.core.ui.utils.parseToBigDecimal
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrency
@@ -136,7 +135,7 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
         if (uiState.value.maxFee != BigDecimal.ZERO) return uiState.value.maxFee
         val yieldTokenStatus = yieldSupplyGetTokenStatusUseCase(cryptoCurrency as CryptoCurrency.Token)
             .getOrNull()
-        return yieldTokenStatus?.maxFeeNative?.parseToBigDecimal(cryptoCurrency.decimals)
+        return yieldTokenStatus?.maxFeeNative
     }
 
     private suspend fun onLoadFee() {