diff --git a/src/components/Form.js b/src/components/Form.js
index ffcd3cbe8cd5..3ea5c13d68f4 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -147,7 +147,10 @@ function Form(props) {
                 setErrors(touchedInputErrors);
             }
 
-            lastValidatedValues.current = values;
+            const isAtLeastOneInputTouched = _.keys(touchedInputs.current).length > 0;
+            if (isAtLeastOneInputTouched) {
+                lastValidatedValues.current = values;
+            }
 
             return touchedInputErrors;
         },