diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultStakingBalanceStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultStakingBalanceStore.kt
index 18aaa9d968..486d520094 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultStakingBalanceStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultStakingBalanceStore.kt
@@ -204,11 +204,8 @@ internal class DefaultStakingBalanceStore(
 
     private fun Set<YieldBalance>.getBalance(address: String?, integrationId: String?): YieldBalance? {
         return firstOrNull { yieldBalance ->
-            val data = yieldBalance as? YieldBalance.Data
-            val balance = data?.balance
-
-            val isCorrectAddress = address != null && address == data?.address
-            val isCorrectIntegration = integrationId != null && balance?.integrationId == integrationId
+            val isCorrectAddress = address != null && address == yieldBalance.address
+            val isCorrectIntegration = integrationId != null && yieldBalance.integrationId == integrationId
 
             isCorrectIntegration && isCorrectAddress
         }
diff --git a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
index 211489e80e..ff2c188133 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
@@ -378,6 +378,7 @@ internal class DefaultStakingRepository(
                     } else {
                         FirebaseCrashlytics.getInstance()
                             .log("No yield balance available for currency ${cryptoCurrency.id.value}")
+                        send(YieldBalance.Error(integrationId, address))
                     }
                 }
         }