diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 32e44932c0..99e803e45b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -120,7 +120,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="success.tangem.com"
+                    android:host="redirect"
                     android:scheme="tangem" />
             </intent-filter>
 
diff --git a/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt b/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt
index a913befc98..08f62eee72 100644
--- a/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt
@@ -1,6 +1,8 @@
 package com.tangem.tap.common
 
 import android.content.Context
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.content.Intent.FLAG_ACTIVITY_NO_HISTORY
 import android.net.Uri
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
@@ -22,6 +24,10 @@ class CustomTabsManager {
                 if (MutableAppThemeModeHolder.isDarkThemeActive) COLOR_SCHEME_DARK else COLOR_SCHEME_LIGHT,
             )
             .build()
+
+        // Open CustomTabsActivity as new task without saving into the stack
+        customTabsIntent.intent.setFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_NO_HISTORY)
+
         customTabsIntent.launchUrl(context, Uri.parse(url))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
index 2432321a48..a3425aeb83 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
@@ -59,9 +59,7 @@ object TradeCryptoMiddleware {
             is TradeCryptoAction.FinishSelling -> openReceiptUrl(action.transactionId)
             is TradeCryptoAction.Buy -> proceedBuyAction(state, action)
             is TradeCryptoAction.Sell -> proceedSellAction(action)
-            is TradeCryptoAction.Swap -> openSwap(
-                currency = action.cryptoCurrency,
-            )
+            is TradeCryptoAction.Swap -> openSwap(currency = action.cryptoCurrency)
             is TradeCryptoAction.SendToken -> {
                 if (isSendRedesignedEnabled) {
                     handleNewSendToken(action = action)
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
index b139b14200..c3f3587c26 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
@@ -67,6 +67,6 @@ interface ExchangeUrlBuilder {
 
     companion object {
         const val SCHEME = "https"
-        const val SUCCESS_URL = "tangem://success.tangem.com"
+        const val SUCCESS_URL = "https://tangem.com/success"
     }
 }
\ No newline at end of file
diff --git a/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt b/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt
index 286f8f8c73..3c31ec55a7 100644
--- a/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt
+++ b/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt
@@ -4,7 +4,7 @@ import com.tangem.core.deeplink.DeepLink
 
 class BuyCurrencyDeepLink(val onReceive: () -> Unit) : DeepLink {
 
-    override val uri: String = "tangem://success.tangem.com"
+    override val uri: String = "tangem://redirect?action=dismissBrowser"
 
     override fun onReceive(params: Map<String, String>) {
         onReceive()