diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensUiManager.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensUiManager.kt
index 49919e627d..410ac938d0 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensUiManager.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensUiManager.kt
@@ -70,8 +70,11 @@ internal class ManageTokensUiManager(
 
                 val updatedBatch = uiBatchToUpdate.copy(
                     data = data.mapIndexed { index, item ->
-                        if (item == currencyBatch.data[index]) {
-                            return@mapIndexed uiBatchToUpdate.data[index]
+                        val uiBatch = uiBatchToUpdate.data.getOrNull(index)
+                        if (item == currencyBatch.data.getOrNull(index) &&
+                            uiBatch != null
+                        ) {
+                            return@mapIndexed uiBatch
                         }
 
                         val previousUiItem = uiBatchToUpdate.data.getOrNull(index)