diff --git a/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue b/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue
index 2ebf89a4..ea6d97df 100644
--- a/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue
+++ b/src/layouts/vehicle-lookup/vin-lookup-methods/vin-lookup-methods.vue
@@ -15,6 +15,7 @@
 
 // Import Other Supporting Files
 import { useMainStore } from '@/store';
+import { experimentSettings } from '@/constants/experiments';
 import vinLookupMethodSelections from '@/constants/vin-lookup-methods';
 import settleAllPromises from '@/helpers/layout-helper';
 import globalRules from '@/constants/global-rules';
@@ -66,8 +67,9 @@ export default {
                     answers.splice(homeAddressIndex, 1);
                 }
 
+                const ymmsBailoutEnabled = this.getSettingValue(experimentSettings.ISS_YMMS_VIN_REQUIRED_BAILOUT_ENABLED) === 'true';
                 const isVinRequired = useMainStore().order.vehicle.vinRequired;
-                if (isVinRequired) {
+                if (isVinRequired && ymmsBailoutEnabled) {
                     const vinIndex = answers.findIndex(answer => answer.Name === vinLookupMethodSelections.NOVIN);
                     if (vinIndex >= 0) {
                         answers.splice(vinIndex, 1);
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index e7a91bc1..ffb0364d 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -179,6 +179,7 @@ export default {
 
             const ymmsBailoutEnabled = this.getSettingValue(experimentSettings.ISS_YMMS_VIN_REQUIRED_BAILOUT_ENABLED) === 'true';
             if (ymmsBailoutEnabled && this.mainStore.order.vehicle.vinRequired) {
+                this.mainStore.order.vehicle.vin = this.vin;
                 this.mainStore.setBailout(bailoutMessage.YMMNotFound());
                 return this.$router.navigate(
                     this.navigationScenarios.BAILOUT,