diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 70437427cd..a2e51dbe74 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -6,6 +6,7 @@ Yii Framework 2 Change Log
 
 - Enh #17382: Added `\yii\validators\DateValidator::$strictDateFormat` to enable strict validation (alexkart)
 - Bug #16394: Fixed issues in `migrate/create` when specifying default values with colons and adding multiple columns (alexkart)
+- Bug #17341: Re-added fix for error from yii.activeForm.js in strict mode (mikehaertl)
 
 
 2.0.21 June 18, 2019
diff --git a/framework/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js
index e4c3962e8d..d4dd15d078 100644
--- a/framework/assets/yii.activeForm.js
+++ b/framework/assets/yii.activeForm.js
@@ -705,10 +705,10 @@
             return false;
         }
 
-        var errorAttributes = [];
-        var $input = findInput($form, this);
+        var errorAttributes = [], $input;
         $.each(data.attributes, function () {
             var hasError = (submitting && updateInput($form, this, messages)) || (!submitting && attrHasError($form, this, messages));
+            $input = findInput($form, this);
 
             if (!$input.is(":disabled") && !this.cancelled && hasError) {
                 errorAttributes.push(this);