diff --git a/app/src/main/java/com/tangem/tap/domain/topup/TopUpManager.kt b/app/src/main/java/com/tangem/tap/domain/topup/TopUpManager.kt
index 9dd6e91960..c5e74334a4 100644
--- a/app/src/main/java/com/tangem/tap/domain/topup/TopUpManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/topup/TopUpManager.kt
@@ -6,6 +6,7 @@ import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.extensions.Result
+import com.tangem.tap.common.extensions.safeUpdate
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TangemSigner
 import com.tangem.tap.store
@@ -14,7 +15,7 @@ import java.math.BigDecimal
 
 class TopUpManager {
     suspend fun topUpTestErc20Tokens(walletManager: EthereumWalletManager, token: Token) {
-        walletManager.update()
+        walletManager.safeUpdate()
 
         val amountToSend = Amount(walletManager.wallet.blockchain)
         val destinationAddress = token.contractAddress
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
index e56b4d9ce6..1d0dc4a9e0 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
@@ -15,6 +15,7 @@ import com.tangem.common.extensions.toHexString
 import com.tangem.crypto.CryptoUtils
 import com.tangem.operations.sign.SignHashCommand
 import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.extensions.safeUpdate
 import com.tangem.tap.common.extensions.toFormattedString
 import com.tangem.tap.features.details.redux.walletconnect.*
 import com.tangem.tap.features.details.ui.walletconnect.dialogs.PersonalSignDialogData
@@ -35,18 +36,11 @@ class WalletConnectSdkHelper {
         id: Long,
         type: WcTransactionType,
     ): WcTransactionData? {
-
         val walletManager = getWalletManager(session) ?: return null
-        try {
-            walletManager.update()
-        } catch (exception: Exception) {
-            Timber.e(exception)
-            return null
-        }
 
+        walletManager.safeUpdate()
         val wallet = walletManager.wallet
-        val balance =
-            wallet.amounts[AmountType.Coin]?.value ?: return null
+        val balance = wallet.amounts[AmountType.Coin]?.value ?: return null
 
         val gas = transaction.gas?.hexToBigDecimal()
             ?: transaction.gasLimit?.hexToBigDecimal()
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
index df4c9120f7..82f43f9812 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
@@ -13,6 +13,8 @@ import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.currenciesRepository
 import com.tangem.tap.domain.extensions.makeWalletManagerForApp
 import com.tangem.tap.domain.extensions.makeWalletManagersForApp
+import com.tangem.tap.features.demo.DemoHelper
+import com.tangem.tap.features.demo.isDemoCard
 import com.tangem.tap.features.wallet.redux.Currency
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletState
@@ -22,6 +24,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.math.BigDecimal
 
 class MultiWalletMiddleware {
     fun handle(
@@ -99,28 +102,25 @@ class MultiWalletMiddleware {
                 scope.launch {
                     walletManagers.map { walletManager ->
                         async(Dispatchers.IO) {
-                            try {
-                                walletManager.update()
-                                val wallet = walletManager.wallet
-                                val coinAmount = wallet.amounts[AmountType.Coin]?.value
-                                if (coinAmount != null && !coinAmount.isZero()) {
-                                    scope.launch(Dispatchers.Main) {
-                                        if (walletState?.getWalletData(wallet.blockchain) == null) {
-                                            store.dispatch(
-                                                WalletAction.MultiWallet.AddWalletManagers(
-                                                    listOfNotNull(walletManager)
-                                                )
+                            walletManager.safeUpdate()
+                            val wallet = walletManager.wallet
+                            val coinAmount = wallet.amounts[AmountType.Coin]?.value
+                            if (coinAmount != null && !coinAmount.isZero()) {
+                                scope.launch(Dispatchers.Main) {
+                                    if (walletState?.getWalletData(wallet.blockchain) == null) {
+                                        store.dispatch(
+                                            WalletAction.MultiWallet.AddWalletManagers(
+                                                listOfNotNull(walletManager)
                                             )
-                                            store.dispatch(
-                                                WalletAction.MultiWallet.AddBlockchain(
-                                                    wallet.blockchain
-                                                )
+                                        )
+                                        store.dispatch(
+                                            WalletAction.MultiWallet.AddBlockchain(
+                                                wallet.blockchain
                                             )
-                                            store.dispatch(WalletAction.LoadWallet.Success(wallet))
-                                        }
+                                        )
+                                        store.dispatch(WalletAction.LoadWallet.Success(wallet))
                                     }
                                 }
-                            } catch (exception: Exception) {
                             }
                         }
                     }