diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressMiddleware.kt
index 1bdef6f35d..96cf7c9c6f 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressMiddleware.kt
@@ -11,8 +11,9 @@ import com.tangem.tap.features.send.redux.AddressVerifyAction.AddressVerificatio
 import com.tangem.tap.features.send.redux.AddressVerifyAction.AddressVerification.SetWalletAddress
 import com.tangem.tap.features.send.redux.AddressVerifyAction.Error
 import com.tangem.tap.mainScope
-import com.tangem.tap.scope
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.rekotlin.Action
 import org.rekotlin.DispatchFunction
 
@@ -169,7 +170,7 @@ internal class AddressMiddleware {
     }
 
     private fun dispatchFailedValidationActions(
-        failReason: AddressVerifyAction.Error,
+        failReason: Error,
         sourceType: AddressEntered.SourceType?,
         dispatch: (Action) -> Unit,
     ) {
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/QuotesResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/QuotesResponse.kt
index e3cd9723b9..2155d0bf77 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/QuotesResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/QuotesResponse.kt
@@ -10,10 +10,8 @@ data class QuotesResponse(
 
     data class Quote(
         @Json(name = "price")
-        val price: BigDecimal,
+        val price: BigDecimal?,
         @Json(name = "priceChange24h")
-        val priceChange: BigDecimal,
-        @Json(name = "lastUpdatedAt")
-        val lastUpdated: String,
+        val priceChange: BigDecimal?,
     )
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesConverter.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesConverter.kt
index 145eaf9800..d76681efa4 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesConverter.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesConverter.kt
@@ -3,6 +3,7 @@ package com.tangem.data.tokens.utils
 import com.tangem.datasource.local.quote.model.StoredQuote
 import com.tangem.domain.tokens.model.Quote
 import com.tangem.utils.converter.Converter
+import java.math.BigDecimal
 
 internal class QuotesConverter : Converter<StoredQuote, Quote> {
 
@@ -11,8 +12,8 @@ internal class QuotesConverter : Converter<StoredQuote, Quote> {
 
         return Quote(
             rawCurrencyId = rawCurrencyId,
-            fiatRate = responseQuote.price,
-            priceChange = responseQuote.priceChange.movePointLeft(2),
+            fiatRate = responseQuote.price ?: BigDecimal.ZERO,
+            priceChange = (responseQuote.priceChange ?: BigDecimal.ZERO).movePointLeft(2),
         )
     }
 }
\ No newline at end of file