diff --git a/theme/boost/amd/build/form-display-errors.min.js b/theme/boost/amd/build/form-display-errors.min.js
index 432391fe866a1..7440d3ae89bec 100644
--- a/theme/boost/amd/build/form-display-errors.min.js
+++ b/theme/boost/amd/build/form-display-errors.min.js
@@ -1 +1 @@
-define(["jquery","core/event"],function(a,b){return{enhance:function(c){var d=document.getElementById(c);a(d).on(b.Events.FORM_FIELD_VALIDATION,function(b,c){b.preventDefault();var e=a(d).closest(".form-group"),f=e.find(".form-control-feedback");""!==c?(e.addClass("has-danger"),a(d).addClass("form-control-danger"),a(d).attr("aria-describedby",a(d).attr("id")+"-feedback"),f.html(c),f.show()):(e.removeClass("has-danger"),a(d).removeClass("form-control-danger"),a(d).attr("aria-describedby",""),f.hide())})}}});
\ No newline at end of file
+define(["jquery","core/event"],function(a,b){return{enhance:function(c){var d=document.getElementById(c);a(d).on(b.Events.FORM_FIELD_VALIDATION,function(b,c){b.preventDefault();var e=a(d).closest(".form-group"),f=e.find(".form-control-feedback");""!==c?(e.addClass("has-danger"),e.data("client-validation-error",!0),a(d).addClass("form-control-danger"),a(d).attr("aria-describedby",a(d).attr("id")+"-feedback"),f.html(c),f.show()):e.data("client-validation-error")===!0&&(e.removeClass("has-danger"),e.data("client-validation-error",!1),a(d).removeClass("form-control-danger"),a(d).attr("aria-describedby",""),f.hide())})}}});
\ No newline at end of file
diff --git a/theme/boost/amd/src/form-display-errors.js b/theme/boost/amd/src/form-display-errors.js
index 766829722747d..f2828f51760e3 100644
--- a/theme/boost/amd/src/form-display-errors.js
+++ b/theme/boost/amd/src/form-display-errors.js
@@ -31,15 +31,19 @@ define(['jquery', 'core/event'], function($, Event) {
                 var feedback = parent.find('.form-control-feedback');
                 if (msg !== '') {
                     parent.addClass('has-danger');
+                    parent.data('client-validation-error', true);
                     $(element).addClass('form-control-danger');
                     $(element).attr('aria-describedby', $(element).attr('id') + '-feedback');
                     feedback.html(msg);
                     feedback.show();
                 } else {
-                    parent.removeClass('has-danger');
-                    $(element).removeClass('form-control-danger');
-                    $(element).attr('aria-describedby', '');
-                    feedback.hide();
+                    if (parent.data('client-validation-error') === true) {
+                        parent.removeClass('has-danger');
+                        parent.data('client-validation-error', false);
+                        $(element).removeClass('form-control-danger');
+                        $(element).attr('aria-describedby', '');
+                        feedback.hide();
+                    }
                 }
             });
         }