diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
index c3aa7806d3..f0a73774ea 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
@@ -1685,7 +1685,7 @@ internal class SwapModel @Inject constructor(
                 val isNotNullCurrency = fromSwapCurrencyStatus != null && toSwapCurrencyStatus != null
                 if (provider != null && swapState != null && isNotNullCurrency) {
                     modelScope.launch {
-                        feeSelectorReloadTrigger.triggerLoadingState()
+                        feeSelectorRepository.state.value = FeeSelectorUM.Loading
                         feeSelectorReloadTrigger.triggerUpdate()
                     }
                     analyticsEventHandler.send(SwapEvents.ProviderChosen(provider))
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapNotificationsFactory.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapNotificationsFactory.kt
index 92e79b91b0..e504ccfdfb 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapNotificationsFactory.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapNotificationsFactory.kt
@@ -384,7 +384,13 @@ internal class SwapNotificationsFactory(
         quoteModel: SwapState.QuotesLoadedState,
         feeError: GetFeeError?,
     ) {
-        if (feeError == null || feeCryptoCurrencyStatus == null) return
+        if (
+            feeError == null || feeCryptoCurrencyStatus == null ||
+            quoteModel.permissionState !is PermissionDataState.Empty
+        ) {
+            return
+        }
+
         when (feeError) {
             is GetFeeError.DataError -> {
                 val error = feeError.cause