diff --git a/lib/src/form/src/form_field.dart b/lib/src/form/src/form_field.dart
index 8afe26c..5a2921f 100644
--- a/lib/src/form/src/form_field.dart
+++ b/lib/src/form/src/form_field.dart
@@ -250,7 +250,14 @@ class _AstromicFormFieldState<T> extends State<AstromicFormField<T>> {
         stateKey: widget.formController.fieldStateKey(widget.formID),
         controller: _controller,
         initialValue: widget.initialValue,
-        onTap: widget.onTap,
+        onTap: widget.onTap != null
+            ? ((T, String)? currentValue) {
+                if (widget.resetMessageOnChange ?? false) {
+                  widget.formController.resetState(widget.formID);
+                }
+                return widget.onTap!(currentValue);
+              }
+            : null,
         onHold: widget.onHold,
         onValueChangedMapper: widget.onValueChangedMapper!,
         //