diff --git a/src/store/index.js b/src/store/index.js
index b6004dd4..76669828 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -528,8 +528,10 @@ export const useMainStore = defineStore({
                 schoolProperty: '',
                 parkingLot: ''
             };
-            if (endorsementAnswersForPayload.includes(endorsementOptions.EDUCATOR && endorsementOptions.PARKING_GUARD)) {
+            if (endorsementAnswersForPayload.includes(endorsementOptions.EDUCATOR)) {
                 endorsementsAdditionalInfo.schoolProperty = 'Yes';
+            }
+            if (endorsementAnswersForPayload.includes(endorsementOptions.PARKING_GUARD)) {
                 endorsementsAdditionalInfo.parkingLot = 'Yes';
             }