diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 5b05cf961..42916b47f 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -265,7 +265,7 @@ export default {
             }
 
             this.dispatchStoreAction(this.storeActions.SAVE_VAPS, this.selectedVaps, false);
-            this.dispatchStoreAction(this.storeActions.SAVE_PROMOS, this.newValidatedPromos, false);
+            this.dispatchStoreAction(this.storeActions.SAVE_PROMOS, this.allActivePromos, false);
 
             const payment = this.$store.getters.payment;
             if (payment.isInsurance) {
diff --git a/src/store/index.js b/src/store/index.js
index 158dc0c54..d52ded426 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2271,10 +2271,12 @@ export const actions = {
             pageNameToLog: pageNameToLog,
         });
 
-        context.commit(
-            storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA,
-            validateResponse.data.lineItemsServerData
-        );
+        if (validateResponse?.data?.serverData) {
+            context.commit(
+                storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA,
+                validateResponse.data.serverData
+            );
+        }
 
         return validateResponse;
     },