diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/DefaultTokensFeatureToggles.kt b/app/src/main/java/com/tangem/tap/domain/tokens/DefaultTokensFeatureToggles.kt
index 2927924f8c..adc8e80741 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/DefaultTokensFeatureToggles.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/DefaultTokensFeatureToggles.kt
@@ -9,4 +9,10 @@ internal class DefaultTokensFeatureToggles(
 
     override val isNetworksLoadingRefactoringEnabled: Boolean
         get() = featureTogglesManager.isFeatureEnabled(name = "NETWORKS_LOADING_REFACTORING_ENABLED")
+
+    override val isQuotesLoadingRefactoringEnabled: Boolean
+        get() = featureTogglesManager.isFeatureEnabled(name = "QUOTES_LOADING_REFACTORING_ENABLED")
+
+    override val isStakingLoadingRefactoringEnabled: Boolean
+        get() = featureTogglesManager.isFeatureEnabled(name = "STAKING_LOADING_REFACTORING_ENABLED")
 }
\ No newline at end of file
diff --git a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
index 526a32d276..66d5de0e26 100644
--- a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
+++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
@@ -66,5 +66,13 @@
     {
         "name": "NETWORKS_LOADING_REFACTORING_ENABLED",
         "version": "5.23.0"
+    },
+    {
+        "name": "QUOTES_LOADING_REFACTORING_ENABLED",
+        "version": "5.24.0"
+    },
+    {
+        "name": "STAKING_LOADING_REFACTORING_ENABLED",
+        "version": "undefined"
     }
 ]
diff --git a/core/datasource/src/main/java/com/tangem/datasource/appcurrency/AppCurrencyResponseStore.kt b/core/datasource/src/main/java/com/tangem/datasource/appcurrency/AppCurrencyResponseStore.kt
index 15d4280a28..5f9e2c12a9 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/appcurrency/AppCurrencyResponseStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/appcurrency/AppCurrencyResponseStore.kt
@@ -1,6 +1,7 @@
 package com.tangem.datasource.appcurrency
 
 import com.tangem.datasource.api.tangemTech.models.CurrenciesResponse
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Store of app currency data model [CurrenciesResponse.Currency]
@@ -9,5 +10,9 @@ import com.tangem.datasource.api.tangemTech.models.CurrenciesResponse
  */
 interface AppCurrencyResponseStore {
 
+    /** Get flow of [CurrenciesResponse.Currency] */
+    fun get(): Flow<CurrenciesResponse.Currency?>
+
+    /** Get [CurrenciesResponse.Currency] synchronously or null */
     suspend fun getSyncOrNull(): CurrenciesResponse.Currency?
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/appcurrency/DefaultAppCurrencyResponseStore.kt b/core/datasource/src/main/java/com/tangem/datasource/appcurrency/DefaultAppCurrencyResponseStore.kt
index 6d1b36f2fd..1c268c06c7 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/appcurrency/DefaultAppCurrencyResponseStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/appcurrency/DefaultAppCurrencyResponseStore.kt
@@ -3,7 +3,9 @@ package com.tangem.datasource.appcurrency
 import com.tangem.datasource.api.tangemTech.models.CurrenciesResponse
 import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.datasource.local.preferences.PreferencesKeys
+import com.tangem.datasource.local.preferences.utils.getObject
 import com.tangem.datasource.local.preferences.utils.getObjectSyncOrNull
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Default implementation of [AppCurrencyResponseStore]
@@ -14,6 +16,10 @@ internal class DefaultAppCurrencyResponseStore(
     private val appPreferencesStore: AppPreferencesStore,
 ) : AppCurrencyResponseStore {
 
+    override fun get(): Flow<CurrenciesResponse.Currency?> {
+        return appPreferencesStore.getObject(PreferencesKeys.SELECTED_APP_CURRENCY_KEY)
+    }
+
     override suspend fun getSyncOrNull(): CurrenciesResponse.Currency? {
         return appPreferencesStore.getObjectSyncOrNull<CurrenciesResponse.Currency>(
             PreferencesKeys.SELECTED_APP_CURRENCY_KEY,
diff --git a/data/quotes/src/main/java/com/tangem/data/quotes/single/DefaultSingleQuoteProducer.kt b/data/quotes/src/main/java/com/tangem/data/quotes/single/DefaultSingleQuoteProducer.kt
index 346bce56ca..d8450243b6 100644
--- a/data/quotes/src/main/java/com/tangem/data/quotes/single/DefaultSingleQuoteProducer.kt
+++ b/data/quotes/src/main/java/com/tangem/data/quotes/single/DefaultSingleQuoteProducer.kt
@@ -3,11 +3,13 @@ package com.tangem.data.quotes.single
 import com.tangem.data.quotes.store.QuotesStoreV2
 import com.tangem.domain.quotes.single.SingleQuoteProducer
 import com.tangem.domain.tokens.model.Quote
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.mapNotNull
 
 /**
@@ -19,6 +21,7 @@ import kotlinx.coroutines.flow.mapNotNull
 internal class DefaultSingleQuoteProducer @AssistedInject constructor(
     @Assisted val params: SingleQuoteProducer.Params,
     private val quotesStore: QuotesStoreV2,
+    private val dispatchers: CoroutineDispatcherProvider,
 ) : SingleQuoteProducer {
 
     override val fallback: Quote = Quote.Empty(rawCurrencyId = params.rawCurrencyId)
@@ -27,6 +30,7 @@ internal class DefaultSingleQuoteProducer @AssistedInject constructor(
         return quotesStore.get()
             .mapNotNull { quotes -> quotes.firstOrNull { it.rawCurrencyId == params.rawCurrencyId } }
             .distinctUntilChanged()
+            .flowOn(dispatchers.default)
     }
 
     @AssistedFactory
diff --git a/data/quotes/src/test/java/com/tangem/data/quotes/single/DefaultSingleQuoteProducerTest.kt b/data/quotes/src/test/java/com/tangem/data/quotes/single/DefaultSingleQuoteProducerTest.kt
index 655c97fad6..1b56374bae 100644
--- a/data/quotes/src/test/java/com/tangem/data/quotes/single/DefaultSingleQuoteProducerTest.kt
+++ b/data/quotes/src/test/java/com/tangem/data/quotes/single/DefaultSingleQuoteProducerTest.kt
@@ -7,6 +7,7 @@ import com.tangem.domain.models.StatusSource
 import com.tangem.domain.quotes.single.SingleQuoteProducer
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.Quote
+import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
@@ -29,6 +30,7 @@ internal class DefaultSingleQuoteProducerTest {
     private val producer = DefaultSingleQuoteProducer(
         params = params,
         quotesStore = quotesStore,
+        dispatchers = TestingCoroutineDispatcherProvider(),
     )
 
     @Test
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/TokensFeatureToggles.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/TokensFeatureToggles.kt
index b48aaa3c4d..be40961b10 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/TokensFeatureToggles.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/TokensFeatureToggles.kt
@@ -8,4 +8,8 @@ package com.tangem.domain.tokens
 interface TokensFeatureToggles {
 
     val isNetworksLoadingRefactoringEnabled: Boolean
+
+    val isQuotesLoadingRefactoringEnabled: Boolean
+
+    val isStakingLoadingRefactoringEnabled: Boolean
 }
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt
index 3e5e99c917..b515f71dd9 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt
@@ -180,6 +180,8 @@ internal class GetPrimaryCurrencyStatusUpdatesUseCaseTest {
 
             tokensFeatureToggles = object : TokensFeatureToggles {
                 override val isNetworksLoadingRefactoringEnabled: Boolean = false
+                override val isQuotesLoadingRefactoringEnabled: Boolean = false
+                override val isStakingLoadingRefactoringEnabled: Boolean = false
             },
             singleNetworkStatusSupplier = mockk(),
             multiNetworkStatusFetcher = mockk(),