diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/stepper/impl/DefaultOnboardingStepperComponent.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/stepper/impl/DefaultOnboardingStepperComponent.kt
index 03d7c218c2..636c9f4f32 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/stepper/impl/DefaultOnboardingStepperComponent.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/stepper/impl/DefaultOnboardingStepperComponent.kt
@@ -43,8 +43,8 @@ internal class DefaultOnboardingStepperComponent @AssistedInject constructor(
 
         componentScope.launch {
             val cardInfo = getWalletMetaInfoUseCase(params.scanResponse).getOrNull() ?: return@launch
-            val userWalletId = cardInfo.userWalletId ?: return@launch
-            val visaCustomerId = getTangemPayCustomerIdUseCase(userWalletId).getOrNull()
+            val userWalletId = cardInfo.userWalletId
+            val visaCustomerId = userWalletId?.let { id -> getTangemPayCustomerIdUseCase(id).getOrNull() }
             sendFeedbackEmailUseCase(
                 if (params.scanResponse.card.isVisa && !visaCustomerId.isNullOrEmpty()) {
                     FeedbackEmailType.Visa.Activation(walletMetaInfo = cardInfo, customerId = visaCustomerId)