diff --git a/addons/payment/static/src/js/payment_form.js b/addons/payment/static/src/js/payment_form.js
index 491cafcf00c..f95fd50f9fe 100644
--- a/addons/payment/static/src/js/payment_form.js
+++ b/addons/payment/static/src/js/payment_form.js
@@ -41,11 +41,11 @@ odoo.define('payment.payment_form', function (require){
                         if(element.dataset.isRequired) {
                             if (element.value.length === 0) {
                                 $(element).closest('div.form-group').addClass('has-error');
+                                empty_inputs = true;
                             }
                             else {
                                 $(element).closest('div.form-group').removeClass('has-error');
                             }
-                            empty_inputs = true;
                         }
                     });