diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/Mapper.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/Mapper.kt
index 43667b8a7b..8b8f7ec97d 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/Mapper.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/Mapper.kt
@@ -112,7 +112,6 @@ private fun WalletDataModel.mapToReduxModel(
             amountFormatted = amountFormatted,
             fiatAmount = fiatAmount,
             fiatAmountFormatted = fiatAmountFormatted,
-            // token = null,
             amountToCreateAccount = (status as? WalletDataModel.NoAccount)
                 ?.amountToCreateAccount
                 ?.toString(),
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
index 07953a62ea..c68b906b9d 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
@@ -315,7 +315,11 @@ class WalletMiddleware {
         scope.launch(Dispatchers.Default) {
             val reduxWalletStores = walletsStores.mapToReduxModels()
             if (!state.isMultiwalletAllowed) {
-                findSelectedCurrency(reduxWalletStores, null, false)?.let {
+                findSelectedCurrency(
+                    walletsStores = reduxWalletStores,
+                    currentSelectedCurrency = null,
+                    isMultiWalletAllowed = false,
+                )?.let {
                     store.dispatchOnMain(WalletAction.MultiWallet.SetSingleWalletCurrency(it))
                 }
             }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
index 28686a5b55..3a535e0375 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
@@ -59,7 +59,7 @@ class MultiWalletReducer {
                     WalletStore(
                         walletManager = walletManager,
                         blockchainNetwork = blockchain,
-                        walletsData = listOfNotNull(walletData),
+                        walletsData = listOf(walletData),
                     )
                 }