diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt
index bc241e0ec0..712782f490 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt
@@ -94,13 +94,15 @@ internal class DefaultSendWithSwapComponent @AssistedInject constructor(
                         )
                         activeComponent.updateState(model.uiState.value.destinationUM)
                     }
-                    is SendWithSwapConfirmComponent -> if (model.currentRoute.value.isEditMode) {
+                    is SendWithSwapConfirmComponent -> {
                         analyticsEventHandler.send(
                             CommonSendAnalyticEvents.ConfirmationScreenOpened(
                                 categoryName = model.analyticCategoryName,
                             ),
                         )
-                        activeComponent.updateState(model.uiState.value)
+                        if (model.currentRoute.value.isEditMode) {
+                            activeComponent.updateState(model.uiState.value)
+                        }
                     }
                 }
                 model.currentRoute.emit(stack.active.configuration)
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/analytics/SendWithSwapAnalyticEvents.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/analytics/SendWithSwapAnalyticEvents.kt
index ad1927f7cd..6daa91c3d8 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/analytics/SendWithSwapAnalyticEvents.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/analytics/SendWithSwapAnalyticEvents.kt
@@ -2,6 +2,7 @@ package com.tangem.features.swap.v2.impl.sendviaswap.analytics
 
 import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.core.analytics.models.AnalyticsParam.Key.FEE_TYPE
 import com.tangem.core.analytics.models.AnalyticsParam.Key.PROVIDER
 import com.tangem.core.analytics.models.AnalyticsParam.Key.RECEIVE_BLOCKCHAIN
 import com.tangem.core.analytics.models.AnalyticsParam.Key.RECEIVE_TOKEN
@@ -24,7 +25,7 @@ internal sealed class SendWithSwapAnalyticEvents(
         event = "Send With Swap In Progress Screen Opened",
         params = mapOf(
             PROVIDER to providerName,
-            "Commission" to if (feeType is AnalyticsParam.FeeType.Normal) "Market" else "Fast",
+            FEE_TYPE to if (feeType is AnalyticsParam.FeeType.Normal) "Market" else "Fast",
             SEND_TOKEN to fromToken.symbol,
             RECEIVE_TOKEN to toToken.symbol,
             SEND_BLOCKCHAIN to fromToken.network.name,