diff --git a/app/src/main/java/com/tangem/tap/data/RuntimeUserWalletsStore.kt b/app/src/main/java/com/tangem/tap/data/RuntimeUserWalletsStore.kt
index 58d13616e4..1661cedb1d 100644
--- a/app/src/main/java/com/tangem/tap/data/RuntimeUserWalletsStore.kt
+++ b/app/src/main/java/com/tangem/tap/data/RuntimeUserWalletsStore.kt
@@ -1,5 +1,6 @@
 package com.tangem.tap.data
 
+import com.tangem.common.CompletionResult
 import com.tangem.datasource.local.userwallet.UserWalletsStore
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWallet
@@ -30,7 +31,10 @@ internal class RuntimeUserWalletsStore(
         return userWalletsListManager.userWallets.firstOrNull()
     }
 
-    override suspend fun update(userWalletId: UserWalletId, update: suspend (UserWallet) -> UserWallet) {
-        userWalletsListManager.update(userWalletId, update)
+    override suspend fun update(
+        userWalletId: UserWalletId,
+        update: suspend (UserWallet) -> UserWallet,
+    ): CompletionResult<UserWallet> {
+        return userWalletsListManager.update(userWalletId, update)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivationsRepository.kt b/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivationsRepository.kt
index d7bb96e4c3..64e1b31472 100644
--- a/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivationsRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivationsRepository.kt
@@ -19,7 +19,7 @@ import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.operations.derivation.ExtendedPublicKeysMap
 import com.tangem.tap.domain.sdk.TangemSdkManager
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import com.tangem.utils.coroutines.runCatching
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 internal typealias Derivations = Map<ByteArrayKey, List<DerivationPath>>
@@ -48,13 +48,12 @@ internal class DefaultDerivationsRepository(
 
         tangemSdkManager.derivePublicKeys(cardId = null, derivations = derivations)
             .doOnSuccess { response ->
-                updatePublicKeys(userWalletId = userWalletId, keys = response.entries).fold(
-                    onSuccess = {
-                        validateDerivations(userWallet.scanResponse, derivations)
+                updatePublicKeys(userWalletId = userWalletId, keys = response.entries)
+                    .doOnSuccess {
+                        validateDerivations(scanResponse = it.scanResponse, derivations = derivations)
                         return
-                    },
-                    onFailure = { throw it },
-                )
+                    }
+                    .doOnFailure { throw it }
             }
             .doOnFailure { throw it }
 
@@ -99,8 +98,8 @@ internal class DefaultDerivationsRepository(
         }
     }
 
-    private suspend fun updatePublicKeys(userWalletId: UserWalletId, keys: DerivedKeys): Result<Unit> {
-        return runCatching(dispatchers.io) {
+    private suspend fun updatePublicKeys(userWalletId: UserWalletId, keys: DerivedKeys): CompletionResult<UserWallet> {
+        return withContext(dispatchers.io) {
             userWalletsStore.update(
                 userWalletId = userWalletId,
                 update = { userWallet -> userWallet.updateDerivedKeys(keys) },
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
index b10741f96c..41495924b3 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
@@ -135,6 +135,7 @@ internal class TokensListMigration(
         derivePublicKeysUseCase(userWalletId = currentUserWallet.walletId, currencies = currencyList)
             .onRight {
                 addCryptoCurrenciesUseCase(userWalletId = currentUserWallet.walletId, currencies = currencyList)
+                store.dispatchNavigationAction { popTo<AppRoute.Wallet>() }
             }
             .onLeft { Timber.e(it, "Failed to derive public keys") }
     }
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
index a716c916bb..6e471d192d 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
@@ -11,8 +11,6 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.*
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.utils.popTo
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.ui.extensions.getActiveIconRes
 import com.tangem.core.ui.extensions.getGreyedOutIconRes
@@ -26,7 +24,6 @@ import com.tangem.domain.tokens.AddCryptoCurrenciesUseCase
 import com.tangem.domain.tokens.GetCryptoCurrenciesUseCase
 import com.tangem.domain.tokens.TokenWithBlockchain
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
-import com.tangem.tap.common.extensions.dispatchNavigationAction
 import com.tangem.tap.common.extensions.fullNameWithoutTestnet
 import com.tangem.tap.common.extensions.getNetworkName
 import com.tangem.tap.features.customtoken.impl.presentation.models.SupportBlockchainType
@@ -326,7 +323,6 @@ internal class TokensListViewModel @Inject constructor(
                 )
 
                 uiState = state.copy(isSavingInProgress = false)
-                store.dispatchNavigationAction { popTo<AppRoute.Wallet>() }
             }
         }
 
diff --git a/app/src/test/kotlin/com/tangem/tap/domain/card/DefaultDerivationsRepositoryTest.kt b/app/src/test/kotlin/com/tangem/tap/domain/card/DefaultDerivationsRepositoryTest.kt
index fdf0ed8db2..12be6b889d 100644
--- a/app/src/test/kotlin/com/tangem/tap/domain/card/DefaultDerivationsRepositoryTest.kt
+++ b/app/src/test/kotlin/com/tangem/tap/domain/card/DefaultDerivationsRepositoryTest.kt
@@ -12,7 +12,9 @@ import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.operations.derivation.DerivationTaskResponse
 import com.tangem.tap.domain.sdk.impl.DefaultTangemSdkManager
 import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
-import io.mockk.*
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -144,7 +146,7 @@ internal class DefaultDerivationsRepositoryTest {
         coEvery { tangemSdkManager.derivePublicKeys(null, any()) } returns CompletionResult.Success(
             DerivationTaskResponse(DerivedKeysMocks.ethereumDerivedKeys),
         )
-        coEvery { userWalletsStore.update(defaultUserWalletId, any()) } just Runs
+        coEvery { userWalletsStore.update(defaultUserWalletId, any()) } returns CompletionResult.Success(userWallet)
 
         runCatching {
             repository.derivePublicKeys(
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/userwallet/UserWalletsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/userwallet/UserWalletsStore.kt
index 6aa2933ba2..54fe4ff322 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/userwallet/UserWalletsStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/userwallet/UserWalletsStore.kt
@@ -1,5 +1,6 @@
 package com.tangem.datasource.local.userwallet
 
+import com.tangem.common.CompletionResult
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.Flow
@@ -14,6 +15,8 @@ interface UserWalletsStore {
 
     suspend fun getAllSyncOrNull(): List<UserWallet>?
 
-    @Throws
-    suspend fun update(userWalletId: UserWalletId, update: suspend (UserWallet) -> UserWallet)
+    suspend fun update(
+        userWalletId: UserWalletId,
+        update: suspend (UserWallet) -> UserWallet,
+    ): CompletionResult<UserWallet>
 }
\ No newline at end of file