diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt
index c3cfe566f3..514b75eb10 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt
@@ -108,9 +108,9 @@ class UserTokensRepository(
             .fold(
                 onSuccess = { response ->
                     response.getOrThrow()
+                        .also { storageService.saveUserTokens(userWalletId, it) }
                         .tokens
                         .mapNotNull(Currency.Companion::fromTokenResponse)
-                        .also { storageService.saveUserTokens(userWalletId, it.toUserTokensResponse()) }
                         .distinct()
                 },
                 onFailure = { handleGetUserTokensFailure(userWalletId = userWalletId, error = it) },