diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/DefaultOnrampMainComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/DefaultOnrampMainComponent.kt
index 22f3fd3a48..e84a3a122a 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/DefaultOnrampMainComponent.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/DefaultOnrampMainComponent.kt
@@ -55,7 +55,10 @@ internal class DefaultOnrampMainComponent @AssistedInject constructor(
             context = childByContext(componentContext),
             params = ConfirmResidencyComponent.Params(
                 country = config.country,
-                onDismiss = { model.bottomSheetNavigation.dismiss() },
+                onDismiss = {
+                    model.bottomSheetNavigation.dismiss()
+                    model.handleOnrampAvailable(it.defaultCurrency)
+                },
             ),
         )
         is OnrampMainBottomSheetConfig.CurrenciesList -> selectCurrencyComponentFactory.create(
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt
index b99613f1ad..cc5155dbc8 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt
@@ -88,6 +88,12 @@ internal class OnrampMainComponentModel @Inject constructor(
         )
     }
 
+    fun handleOnrampAvailable(currency: OnrampCurrency) {
+        _state.update { stateFactory.getReadyState(currency) }
+        subscribeToCurrencyUpdates()
+        subscribeToQuotesUpdate()
+    }
+
     fun onProviderSelected(providerWithQuote: OnrampProviderWithQuote.Data) {
         _state.update { amountStateFactory.getAmountSecondaryUpdatedState(providerWithQuote) }
     }
@@ -109,12 +115,6 @@ internal class OnrampMainComponentModel @Inject constructor(
         }
     }
 
-    private fun handleOnrampAvailable(currency: OnrampCurrency) {
-        _state.update { stateFactory.getReadyState(currency) }
-        subscribeToCurrencyUpdates()
-        subscribeToQuotesUpdate()
-    }
-
     private fun subscribeToCurrencyUpdates() {
         getOnrampCurrencyUseCase.invoke()
             .onEach { maybeCurrency ->