diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index 3713c72808..82d4d105bc 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -86,9 +86,11 @@ class TapWalletManager {
         }
         tapWorkarounds = TapWorkarounds(data.card)
         if (tapWorkarounds!!.isStart2Coin) {
-            store.state.globalState.configManager?.turnOf(ConfigManager.isWalletPayIdEnabled)
+            store.state.globalState.configManager?.turnOff(ConfigManager.isWalletPayIdEnabled)
+            store.state.globalState.configManager?.turnOff(ConfigManager.isTopUpEnabled)
         } else {
             store.state.globalState.configManager?.resetToDefault(ConfigManager.isWalletPayIdEnabled)
+            store.state.globalState.configManager?.resetToDefault(ConfigManager.isTopUpEnabled)
         }
         withContext(Dispatchers.Main) {
             store.dispatch(WalletAction.ResetState)
@@ -109,9 +111,7 @@ class TapWalletManager {
                 val config = store.state.globalState.configManager?.config ?: return@withContext
 
                 store.dispatch(WalletAction.LoadWallet(
-                        data.walletManager.wallet, data.verifyResponse?.artworkInfo?.id,
-                        tapWorkarounds?.isStart2Coin == false && config.isTopUpEnabled
-                ))
+                        data.walletManager.wallet, data.verifyResponse?.artworkInfo?.id, config.isTopUpEnabled))
                 store.dispatch(WalletAction.LoadArtwork(data.card, artworkId))
                 store.dispatch(WalletAction.LoadFiatRate)
                 store.dispatch(WalletAction.LoadPayId)
diff --git a/app/src/main/java/com/tangem/tap/domain/config/ConfigManager.kt b/app/src/main/java/com/tangem/tap/domain/config/ConfigManager.kt
index 668339cd20..339aeb3124 100644
--- a/app/src/main/java/com/tangem/tap/domain/config/ConfigManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/config/ConfigManager.kt
@@ -34,7 +34,7 @@ class ConfigManager(
         }
     }
 
-    fun turnOf(name: String) {
+    fun turnOff(name: String) {
         when (name) {
             isWalletPayIdEnabled -> config = config.copy(isWalletPayIdEnabled = false)
             isTopUpEnabled -> config = config.copy(isTopUpEnabled = false)