diff --git a/src/layouts/review/review-sections/service-package-review/service-package-review.vue b/src/layouts/review/review-sections/service-package-review/service-package-review.vue
index d383405aa..c842c18c9 100644
--- a/src/layouts/review/review-sections/service-package-review/service-package-review.vue
+++ b/src/layouts/review/review-sections/service-package-review/service-package-review.vue
@@ -18,7 +18,9 @@ export default {
         servicePackageOptionsCmsName: String,
         defaultPackageItemsCmsName: String,
         vapsItemsCmsName: String,
-        availableLineItems: Array,
+        availableVaps: Array,
+        lineItems: Object,
+        damage: Object,
     },
     data() {
         return {};
@@ -79,13 +81,20 @@ export default {
             );
         },
         glassToReplace() {
-            return this.$store.getters.order.damage.glassToReplace;
+            return this.damage.glassToReplace;
         },
         isRepair() {
-            return this.$store.getters.order.damage.isRepair;
+            return this.damage.isRepair;
         },
         vaps() {
-            return this.$store.getters.lineItems.vaps;
+            return this.lineItems?.vaps;
+        },
+        availableLineItems() {
+            return [
+                ...(this.lineItems?.glassParts ?? []),
+                ...(this.lineItems?.supportingItems ?? []),
+                ...this.availableVaps,
+            ];
         },
     },
     components: {
diff --git a/src/layouts/review/review.vue b/src/layouts/review/review.vue
index 71411d775..e1ecf5b88 100644
--- a/src/layouts/review/review.vue
+++ b/src/layouts/review/review.vue
@@ -57,7 +57,9 @@
                     servicePackageOptionsCmsName="ServicePackageTitle"
                     defaultPackageItemsCmsName="DefaultPackageItemDescriptions"
                     vapsItemsCmsName="VapsItemDescriptions"
-                    :availableLineItems="availableLineItems"
+                    :damage="damageInfo"
+                    :availableVaps="availableVaps"
+                    :lineItems="lineItems"
                     @edit-clicked="editServicePackage" />
             </div>
 
@@ -167,13 +169,11 @@ export default {
         damageInfo() {
             return this.$store.getters.damage;
         },
-        availableLineItems() {
-            return [
-                ...(this.$store.getters.lineItems.glassParts ?? []),
-                ...(this.$store.getters.lineItems.supportingItems ?? []),
-                ...(this.availableWipers ?? []),
-                ...(this.availableRainDefense ?? []),
-            ];
+        availableVaps() {
+            return [...(this.availableWipers ?? []), ...(this.availableRainDefense ?? [])];
+        },
+        lineItems() {
+            return this.$store.getters.lineItems;
         },
     },
     components: {