diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/common/setup/NaviPayRouter.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/common/setup/NaviPayRouter.kt
index ffa73c70b0..1379e5a407 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/common/setup/NaviPayRouter.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/common/setup/NaviPayRouter.kt
@@ -100,7 +100,10 @@ object NaviPayRouter {
                 putExtra(NEEDS_RESULT, needResultFromNaviPay)
                 putExtra(SOURCE_MODULE, sourceModule)
                 putExtras(bundle)
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                // TODO: Once delayed onboarding is 100%, add back change from #11912
+                if (isIntentFlow && !isNaviPayOriginatedIntent) {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                }
                 // For Ian flow, replicate the same flow as that of PN
                 if (isFromIan) {
                     putExtra(NAVI_PAY_NOTIFICATION_DATA_BUNDLE, bundle)