diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt
index 462ec0dde0..52a83baf67 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt
@@ -479,6 +479,10 @@ constructor(
                 bankUptimeSuccessRate =
                     selectedBankAccount.value?.bankUptimeEntity?.successRate.orZero(),
             )
+            if (bankAccountsState.value is BankAccountsState.NoAccountLinked) {
+                addAccount()
+                return@launch
+            }
             getOnboardedStackDataForMandate(
                 onOnboardingTriggered = { updateBottomSheetUIState(showBottomSheet = false) },
                 onPspEvaluated = { pspEvaluationResult ->
@@ -1094,6 +1098,7 @@ constructor(
 
             naviPayPspManager.handleAccountAdditionFlow(
                 screenName = screenName,
+                onOnboardingTriggered = { updateBottomSheetUIState(showBottomSheet = false) },
                 enabledAccountTypes = SAVINGS_ONLY_ENABLED_ACCOUNTS,
             )
         }