diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index b8e481174..6c547f3d2 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -745,10 +745,16 @@ export default {
             }
         },
         updatePaymentMethod(paymentMethod) {
-            // if the payment method is not set yet, then set it based on what HOP sends us
+            debugLog(
+                `updatePaymentMethod(${paymentMethod}) and existing store.getters.order.payment.piaType = ${store?.getters?.order?.payment?.piaType}`
+            );
+
+            // if the payment method is not set yet, then set it based on what HOP sends
+            //  or if its not already set to AfterPay, always set it based on what HOP sends
             if (
                 store.getters.order.payment.piaType == paymentMethods.PAY_NOW ||
-                store.getters.order.payment.piaType == paymentMethods.NONE
+                store.getters.order.payment.piaType == paymentMethods.NONE ||
+                store.getters.order.payment.piaType != paymentMethods.AFTERPAY
             ) {
                 console.log(new Date() + " UPDATE PaymentMethod from HOP:" + paymentMethod);
                 this.dispatchStoreAction(