diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt
index 20cdc81e55..ce7a1c066a 100644
--- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt
+++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt
@@ -9,6 +9,7 @@ import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.data.common.api.safeApiCall
 import com.tangem.data.common.currency.CardCryptoCurrencyFactory
 import com.tangem.data.common.currency.UserTokensResponseFactory
+import com.tangem.data.common.currency.UserTokensSaver
 import com.tangem.data.common.network.NetworkFactory
 import com.tangem.data.common.utils.retryOnError
 import com.tangem.data.managetokens.utils.ManageTokensUpdateFetcher
@@ -42,6 +43,7 @@ import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 internal class DefaultManageTokensRepository(
     private val tangemTechApi: TangemTechApi,
     private val userWalletsStore: UserWalletsStore,
+    private val userTokenSaver: UserTokensSaver,
     private val manageTokensUpdateFetcher: ManageTokensUpdateFetcher,
     private val userTokensResponseStore: UserTokensResponseStore,
     private val testnetTokensStorage: TestnetTokensStorage,
@@ -127,7 +129,8 @@ internal class DefaultManageTokensRepository(
         val tokensResponse = request.params.userWalletId?.let { userWalletId ->
             if (loadUserTokensFromRemote && userWallet != null) {
                 safeApiCall({ tangemTechApi.getUserTokens(userWalletId.stringValue).bind() }) {
-                    createDefaultUserTokensResponse(userWallet)
+                    // save tokens response only if loadUserTokensFromRemote is true and it means onboarding call
+                    createAndSaveDefaultUserTokensResponse(userWallet = userWallet)
                 }
             } else {
                 getSavedUserTokensResponseSync(userWalletId)
@@ -158,6 +161,12 @@ internal class DefaultManageTokensRepository(
         )
     }
 
+    private suspend fun createAndSaveDefaultUserTokensResponse(userWallet: UserWallet): UserTokensResponse {
+        val userTokensResponse = createDefaultUserTokensResponse(userWallet)
+        userTokenSaver.store(userWallet.walletId, userTokensResponse, useEnricher = false)
+        return userTokensResponse
+    }
+
     private suspend fun fetchTestnetCurrencies(
         userWallet: UserWallet,
         request: Request<ManageTokensListConfig>,
diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/di/ManageTokensDataModule.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/di/ManageTokensDataModule.kt
index 87943d1e88..412155dcda 100644
--- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/di/ManageTokensDataModule.kt
+++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/di/ManageTokensDataModule.kt
@@ -32,6 +32,7 @@ internal object ManageTokensDataModule {
         userWalletsStore: UserWalletsStore,
         manageTokensUpdateFetcher: ManageTokensUpdateFetcher,
         userTokensResponseStore: UserTokensResponseStore,
+        userTokensSaver: UserTokensSaver,
         testnetTokensStorage: TestnetTokensStorage,
         dispatchers: CoroutineDispatcherProvider,
         excludedBlockchains: ExcludedBlockchains,
@@ -43,6 +44,7 @@ internal object ManageTokensDataModule {
             userWalletsStore = userWalletsStore,
             manageTokensUpdateFetcher = manageTokensUpdateFetcher,
             userTokensResponseStore = userTokensResponseStore,
+            userTokenSaver = userTokensSaver,
             testnetTokensStorage = testnetTokensStorage,
             excludedBlockchains = excludedBlockchains,
             cardCryptoCurrencyFactory = cardCryptoCurrencyFactory,
diff --git a/domain/manage-tokens/src/main/kotlin/com/tangem/domain/managetokens/GetManagedTokensUseCase.kt b/domain/manage-tokens/src/main/kotlin/com/tangem/domain/managetokens/GetManagedTokensUseCase.kt
index e8a4b8d205..6a9c3a47ed 100644
--- a/domain/manage-tokens/src/main/kotlin/com/tangem/domain/managetokens/GetManagedTokensUseCase.kt
+++ b/domain/manage-tokens/src/main/kotlin/com/tangem/domain/managetokens/GetManagedTokensUseCase.kt
@@ -10,6 +10,7 @@ class GetManagedTokensUseCase(
 
     operator fun invoke(
         context: ManageTokensListBatchingContext,
+        // only for onboarding case, change carefully and check repository implementation
         loadUserTokensFromRemote: Boolean,
         batchSize: Int = 40,
     ): ManageTokensListBatchFlow {
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensListManager.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensListManager.kt
index b486703bd8..7664a6ce6e 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensListManager.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensListManager.kt
@@ -93,6 +93,7 @@ internal class ManageTokensListManager @AssistedInject constructor(
                 actionsFlow = actionsFlow,
                 coroutineScope = this,
             ),
+            // only for onboarding case, change carefully and check repository implementation
             loadUserTokensFromRemote = userWalletId != null && source == ManageTokensSource.ONBOARDING,
         )