diff --git a/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt b/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt
index 57adf472ad..4828371761 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt
@@ -30,6 +30,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.util.fastForEach
+import androidx.compose.ui.util.fastForEachIndexed
 import com.tangem.common.ui.R
 import com.tangem.common.ui.account.*
 import com.tangem.core.ui.components.PrimaryButton
@@ -188,7 +190,7 @@ private fun AccountColor(colorsState: AccountCreateEditUM.Colors) {
                 .padding(contentPadding),
             horizontalArrangement = Arrangement.spacedBy(4.dp),
         ) {
-            colorsState.list.forEach { color ->
+            colorsState.list.fastForEach { color ->
                 val isSelected = color == colorsState.selected
                 Box(
                     contentAlignment = Alignment.Center,
@@ -237,7 +239,7 @@ private fun AccountIcons(iconsState: AccountCreateEditUM.Icons) {
             maxItemsInEachRow = 6,
             modifier = Modifier.fillMaxWidth(),
         ) {
-            iconsState.list.forEachIndexed { index, icon ->
+            iconsState.list.fastForEachIndexed { index, icon ->
                 val isSelected = icon == iconsState.selected
                 Box(
                     contentAlignment = Alignment.Center,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicAccountListSubscriber.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicAccountListSubscriber.kt
index 40a9681b13..c8e072d004 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicAccountListSubscriber.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicAccountListSubscriber.kt
@@ -49,7 +49,6 @@ internal abstract class BasicAccountListSubscriber : BasicWalletSubscriber() {
         yieldSupplyApyMap: Map<String, String> = emptyMap(),
         stakingApyMap: Map<String, List<Yield.Validator>> = emptyMap(),
     ) {
-        val accountFlattenCurrencies = accountList.flattenCurrencies()
         val mainAccount = accountList.mainAccount
 
         when {
@@ -70,20 +69,8 @@ internal abstract class BasicAccountListSubscriber : BasicWalletSubscriber() {
                 )
             }
             isAccountMode -> {
-                val isAllAccountsEmpty = accountFlattenCurrencies.isEmpty()
-                if (isAllAccountsEmpty) {
-                    stateController.update(
-                        SetTokenListErrorTransformer(
-                            selectedWallet = userWallet,
-                            error = TokenListError.EmptyTokens,
-                            appCurrency = appCurrency,
-                        ),
-                    )
-                } else {
-                    val convertParams = TokenConverterParams.Account(accountList, expandedAccounts)
-
-                    updateContent(convertParams, appCurrency, yieldSupplyApyMap, stakingApyMap)
-                }
+                val convertParams = TokenConverterParams.Account(accountList, expandedAccounts)
+                updateContent(convertParams, appCurrency, yieldSupplyApyMap, stakingApyMap)
             }
         }
     }