diff --git a/js/foundation.abide.js b/js/foundation.abide.js
index cd1aca3490..dda0901715 100644
--- a/js/foundation.abide.js
+++ b/js/foundation.abide.js
@@ -510,10 +510,9 @@ class Abide extends Plugin {
     }
 
     if (manageErrorClasses) {
+      this.removeErrorClasses($el);
       if (!goodToGo) {
-        this.addErrorClasses($el, failedValidators);
-      } else {
-        this.removeErrorClasses($el);
+          this.addErrorClasses($el, failedValidators);
       }
     }