diff --git a/src/store/index.js b/src/store/index.js
index a43eec95..a23fa760 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1475,7 +1475,7 @@ export const useMainStore = defineStore({
                     OemEndorsement: this.hasOemEndorsement,
                     noCoverage: this.isNoComp,
                     isItac: this.isITAC,
-                    cvrgEndorsementCode: policy.cvrgEndorsementCode,
+                    cvrgEndorsementCode: policy.cvrgEndorsementCode ?? endorsementCodesForSelectedVehicle(vehicle),
                     educatorEndorsement: policy.educatorEndorsementAnswer,
                     parkingGuardEndorsement: policy.parkingGuardEndorsementAnswer
                 },