diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletData.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletData.kt
index 96eb9d55c8..e4e5f8e78c 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletData.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletData.kt
@@ -41,10 +41,10 @@ data class WalletData(
         swapFeatureToggleManager: SwapFeatureToggleManager,
         swapInteractor: SwapInteractor,
     ): Boolean {
-        val isOptimismEnabled =
-            currency.blockchain.id == Blockchain.Optimism.id && swapFeatureToggleManager.isOptimismSwapEnabled
+        if (currency.blockchain.id == Blockchain.Optimism.id && !swapFeatureToggleManager.isOptimismSwapEnabled) {
+            return false
+        }
         return swapInteractor.isAvailableToSwap(currency.blockchain.toNetworkId()) &&
-            isOptimismEnabled &&
             !currency.isCustomCurrency(null)
     }
 
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
index d802d67613..e441f3bf63 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
@@ -438,7 +438,7 @@ internal class SwapViewModel @Inject constructor(
 
     companion object {
         private const val INITIAL_AMOUNT = ""
-        private const val UPDATE_DELAY = 1000000L
+        private const val UPDATE_DELAY = 10000L
         private const val DEBOUNCE_AMOUNT_DELAY = 1000L
     }
 }
\ No newline at end of file