diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetRewardsBalanceUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetRewardsBalanceUseCase.kt
index 93e18928bf..f0b5c39b43 100644
--- a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetRewardsBalanceUseCase.kt
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetRewardsBalanceUseCase.kt
@@ -29,6 +29,9 @@ class YieldSupplyGetRewardsBalanceUseCase(
         val fiatRate = status.value.fiatRate
 
         if (cryptoAmount?.compareTo(BigDecimal.ZERO) == 0) {
+            emit(
+                YieldSupplyRewardBalance(fiatBalance = null, cryptoBalance = null),
+            )
             return@flow
         }
 
diff --git a/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetRewardsBalanceUseCaseTest.kt b/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetRewardsBalanceUseCaseTest.kt
index c086813f73..d8b29bfd94 100644
--- a/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetRewardsBalanceUseCaseTest.kt
+++ b/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetRewardsBalanceUseCaseTest.kt
@@ -49,6 +49,38 @@ class YieldSupplyGetRewardsBalanceUseCaseTest {
         assertThat(emissions).isEmpty()
     }
 
+    @Test
+    fun `GIVEN zero amount WHEN invoke THEN emit null balances`() = runTest {
+        val network = createNetwork()
+        val token = createToken(network)
+        val status = CryptoCurrencyStatus(
+            currency = token,
+            value = CryptoCurrencyStatus.Custom(
+                amount = BigDecimal.ZERO,
+                fiatAmount = null,
+                fiatRate = BigDecimal.ONE,
+                priceChange = null,
+                yieldBalance = null,
+                yieldSupplyStatus = null,
+                hasCurrentNetworkTransactions = false,
+                pendingTransactions = emptySet(),
+                networkAddress = NetworkAddress.Single(
+                    NetworkAddress.Address(value = "0xabc", type = NetworkAddress.Address.Type.Primary),
+                ),
+                sources = CryptoCurrencyStatus.Sources(),
+            ),
+        )
+
+        val dispatcherProvider = testDispatcherProvider(this)
+        val useCase = YieldSupplyGetRewardsBalanceUseCase(repository, dispatcherProvider)
+        val appCurrency = AppCurrency.Default
+
+        val emissions = useCase(status, appCurrency).toList()
+        assertThat(emissions).hasSize(1)
+        assertThat(emissions[0].fiatBalance).isNull()
+        assertThat(emissions[0].cryptoBalance).isNull()
+    }
+
     @Test
     fun `GIVEN coin currency WHEN invoke THEN emit nothing`() = runTest {
         val network = createNetwork()
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
index 306315e766..908fdf6c7e 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
@@ -98,8 +98,16 @@ internal class TokenDetailsLoadedBalanceConverter(
                     stakingCryptoAmount,
                     currentState.selectedBalanceType,
                 ),
-                displayYieldSupplyFiatBalance = (currentState as? TokenDetailsBalanceBlockState.Content)
-                    ?.displayYieldSupplyFiatBalance,
+                displayYieldSupplyFiatBalance = if (status.value.yieldSupplyStatus?.isActive == true) {
+                    (currentState as? TokenDetailsBalanceBlockState.Content)?.displayYieldSupplyFiatBalance
+                } else {
+                    null
+                },
+                displayYieldSupplyCryptoBalance = if (status.value.yieldSupplyStatus?.isActive == true) {
+                    (currentState as? TokenDetailsBalanceBlockState.Content)?.displayYieldSupplyCryptoBalance
+                } else {
+                    null
+                },
                 balanceSegmentedButtonConfig = currentState.balanceSegmentedButtonConfig,
                 onBalanceSelect = clickIntents::onBalanceSelect,
                 selectedBalanceType = currentState.selectedBalanceType,