diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 194243d38..74a3c65c0 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -78,7 +78,7 @@
                         validationRules="payment-method-required" />
 
                     <alert
-                        v-if="!showPaymentMethodQuestions && !forwardClicked"
+                        v-if="showHavePaymentReadyAlert"
                         :isDismissible="false"
                         alertClass="alert-info"
                         cmsWidgetName="NoPiaDisclaimerWidget"
@@ -681,6 +681,11 @@ export default {
 
             return false;
         },
+        showHavePaymentReadyAlert() {
+            return (
+                !this.showPaymentMethodQuestions && !this.forwardClicked && this.totalAmountDue > 0
+            );
+        },
         totalAmountDue() {
             return baseMixin.methods.getAmountDue(this.lineItems);
         },
diff --git a/src/router/index.js b/src/router/index.js
index 72e28ed59..218e32d35 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -116,7 +116,10 @@ const routes = [
                         );
 
                         // clear part related state because heritage selected a new vehicle
-                        if (to.query.fmgPage === fmgPageValues.VEHICLE && eval(getFunnelCookie()?.HasDelayedClaimRegistration)) {
+                        if (
+                            to.query.fmgPage === fmgPageValues.VEHICLE &&
+                            eval(getFunnelCookie()?.HasDelayedClaimRegistration)
+                        ) {
                             console.log(new Date() + "Router: Policy Vehicle Changed");
                             store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
                         }