diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index abad0da7d..e93e0fbd0 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -100,6 +100,7 @@ import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
 import { nextTick } from "vue";
 import { getBoolFromString } from "@/helpers/boolean-helper";
+import { externalParameterStatus } from "@/constants/external-parameters";
 // DEFINE VALIDATION RULES
 defineRule("replace-options-required", required(errorMessages.REPLACE_OPTIONS_REQUIRED));
 
@@ -143,7 +144,9 @@ export default {
             vm.$refs.backGlassOptions.initializeComponent(
                 resultMap.damageOptions.backGlassOptions.availableReplacementOptions
             );
-            if (store.getters.externalParameterState?.isExternalParameter) {
+            if (store.getters.externalParameterState?.isExternalParameter && 
+                store.getters.externalParameterState?.isExternalParameter === externalParameterStatus.ACTIVE &&
+                store.getters.externalParameterState.vehicleDamage?.damageType) {
                 await nextTick();
                 const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
                 debugLog(`**** vehicle-damage is form valid: ${isValid}  ****`);
@@ -355,7 +358,9 @@ export default {
                 ) {
                     windShieldOptions.selectedWindshieldDamageType =
                         damageLocationsSelected.REPLACE;
-                    if (!store.getters.externalParameterState.isExternalParameter) {
+                    if (!store.getters.externalParameterState.isExternalParameter ||
+                        store.getters.externalParameterState?.isExternalParameter !== externalParameterStatus.ACTIVE ||
+                        !store.getters.externalParameterState.vehicleDamage?.damageType) {
                         windShieldOptions.selectedWindshieldReplaceOptions.push(
                             damageLocationsSelected.SINGLE
                         );
@@ -666,12 +671,20 @@ export default {
             return this.$store.getters.requiresVerifiedRedirecting;
         },
         isContinueEnabled() {
-            return (
+            var isEnabled = (
                 this.isAnyDamageSelected &&
                 this.isWindshieldValid &&
                 this.isRearGlassValid &&
                 this.isSideGlassValid
             );
+            if (!isEnabled) {
+                debugLog(`************************ isContinueEnabled: ${isEnabled}  *****************************`);
+                debugLog(`**** this.isAnyDamageSelected: ${this.isAnyDamageSelected}  ****`);
+                debugLog(`**** this.isWindshieldValid: ${this.isWindshieldValid}  ****`);
+                debugLog(`**** this.isRearGlassValid: ${this.isRearGlassValid}  ****`);
+                debugLog(`**** this.isSideGlassValid: ${this.isSideGlassValid}  ****`);
+            }
+            return isEnabled;
         },
         isAnyDamageSelected() {
             return this.selectedDamageLocations != null && this.selectedDamageLocations.length != 0;