diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue
index e68774fb..e730a4f0 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.vue
+++ b/src/iss-components/cart-dropdown/cart-dropdown.vue
@@ -184,13 +184,12 @@ export default {
         recyclingModalCmsWidgetName: String,
         showDropdownHeader: Boolean,
         isInitiallyExpanded: Boolean,
-        submittedOrder: Object,
-        selectedVaps: Array
+        submittedOrder: Object
     },
     data() {
         return {
             isExpanded: this.isInitiallyExpanded,
-            availableVaps: useMainStore().order.availableVaps,
+            availableVaps: this.submittedOrder ? this.submittedOrder.lineItems.vaps : useMainStore().order.availableVaps,
             widget: {
                 amountDue: 'AmountDueTextWidget',
                 amountPaid: 'AmountPaidTextWidget',
diff --git a/src/layouts/order-confirmation/order-confirmation.vue b/src/layouts/order-confirmation/order-confirmation.vue
index 666545f5..7189fab3 100644
--- a/src/layouts/order-confirmation/order-confirmation.vue
+++ b/src/layouts/order-confirmation/order-confirmation.vue
@@ -53,7 +53,6 @@
                             :readOnly="true"
                             recyclingModalCmsWidgetName="RecycleModal"
                             servicePackageTitleWidgetName="ServicePackageTitle"
-                            :selectedVaps="selectedVaps"
                             :submittedOrder="submittedOrder" />
                     </div>
                     <div