diff --git a/web/html/src/components/input/InputBase.tsx b/web/html/src/components/input/InputBase.tsx
index 174be610433..ef46b51e28a 100644
--- a/web/html/src/components/input/InputBase.tsx
+++ b/web/html/src/components/input/InputBase.tsx
@@ -89,7 +89,6 @@ export type InputBaseProps<ValueType = string> = {
 };
 
 type State = {
-  isValid: boolean;
   isTouched: boolean;
 
   /**
@@ -98,9 +97,9 @@ type State = {
   formErrors?: string[];
 
   /**
-   * Validation errors
+   * Validation errors, a `Map` from a given validator to its result
    */
-  validationErrors: ValidationResult[];
+  validationErrors: Map<number, ValidationResult>;
 };
 
 export class InputBase<ValueType = string> extends React.Component<InputBaseProps<ValueType>, State> {
@@ -120,10 +119,9 @@ export class InputBase<ValueType = string> extends React.Component<InputBaseProp
   constructor(props: InputBaseProps<ValueType>) {
     super(props);
     this.state = {
-      isValid: true,
       isTouched: false,
       formErrors: undefined,
-      validationErrors: [],
+      validationErrors: new Map(),
     };
   }
 
@@ -187,11 +185,11 @@ export class InputBase<ValueType = string> extends React.Component<InputBaseProp
 
   componentWillUnmount() {
     if (Object.keys(this.context).length > 0) {
-      this.context.unregisterInput(this);
-      if (this.props.name instanceof Array) {
-        this.props.name.forEach((name) => this.context.setModelValue(name, undefined));
-      } else {
-        this.context.setModelValue(this.props.name, undefined);
+      this.context.unregisterInput?.(this);
+      if (Array.isArray(this.props.name)) {
+        this.props.name.forEach((name) => this.context.setModelValue?.(name, undefined));
+      } else if (this.props.name) {
+        this.context.setModelValue?.(this.props.name, undefined);
       }
     }
   }
@@ -202,10 +200,6 @@ export class InputBase<ValueType = string> extends React.Component<InputBaseProp
     });
   };
 
-  isValid() {
-    return this.state.isValid;
-  }
-
   isEmptyValue(input: unknown) {
     if (typeof input === "string") {
       return input.trim() === "";
@@ -238,7 +232,6 @@ export class InputBase<ValueType = string> extends React.Component<InputBaseProp
    */
   validate = _debounce(
     async <InferredValueType extends unknown = ValueType>(value: InferredValueType): Promise<void> => {
-      // TODO: If it's an array, automatically wrap it in `Validate.all()`
       const validators = Array.isArray(this.props.validate) ? this.props.validate : [this.props.validate] ?? [];
 
       // TODO: Move this into render so it's always sync and up to date instantly
@@ -257,14 +250,14 @@ export class InputBase<ValueType = string> extends React.Component<InputBaseProp
             return;
           }
 
+          // BUG: We don't handle race conditions here, it's a bug, but it will get fixed for free this once we swap this code out for Formik
           const result = await validator(value);
-          // console.log(validator, result);
           this.setState((state) => {
-            const newValidationErrors = [...state.validationErrors];
+            const newValidationErrors = new Map(state.validationErrors);
             if (result) {
-              newValidationErrors[index] = result;
+              newValidationErrors.set(index, result);
             } else {
-              newValidationErrors[index] = undefined;
+              newValidationErrors.delete(index);
             }
 
             return {
@@ -275,13 +268,21 @@ export class InputBase<ValueType = string> extends React.Component<InputBaseProp
         })
       );
 
-      if (this.context.validateForm != null) {
-        this.context.validateForm();
-      }
+      this.context.validateForm?.();
     },
     this.props.debounceValidate ?? 0
   );
 
+  isValid = () => {
+    if (this.state.formErrors && this.state.formErrors.length > 0) {
+      return false;
+    }
+    if (this.state.validationErrors.size > 0) {
+      return false;
+    }
+    return true;
+  };
+
   setFormErrors = (formErrors?: string[]) => {
     this.setState({ formErrors });
   };
@@ -326,14 +327,13 @@ export class InputBase<ValueType = string> extends React.Component<InputBaseProp
   }
 
   render() {
-    const hasFormError = !!this.state.formErrors?.length;
-    const hasError = hasFormError || (this.state.isTouched && !this.state.isValid);
-
     const hints: React.ReactNode[] = [];
     this.pushHint(hints, this.props.hint);
     this.state.formErrors?.forEach((error) => this.pushHint(hints, error));
     this.state.validationErrors.forEach((error) => this.pushHint(hints, error));
 
+    const hasError = this.state.isTouched && !this.isValid();
+
     return (
       <FormGroup isError={hasError} key={`${this.props.name}-group`} className={this.props.className}>
         {this.props.label && (
diff --git a/web/html/src/components/input/validate.ts b/web/html/src/components/input/validate.ts
index c3261d7ec71..490d017d012 100644
--- a/web/html/src/components/input/validate.ts
+++ b/web/html/src/components/input/validate.ts
@@ -6,14 +6,6 @@ type SyncOrAsync<T> = T | Promise<T>;
 export type ValidationResult = OneOrMany<Exclude<React.ReactNode, boolean> | undefined>;
 export type Validator = (...args: any[]) => SyncOrAsync<ValidationResult>;
 
-// TODO: This is really internal, do we need to expose this?
-const all =
-  (validators: Validator[]): Validator =>
-  async (value: string) => {
-    const result = await Promise.all(validators.map((item) => item(value)));
-    return result.filter((item) => item !== undefined).flat();
-  };
-
 /** String must match `regex` */
 const matches =
   (regex: RegExp, message?: string): Validator =>
@@ -68,7 +60,6 @@ const isInt =
   };
 
 export const Validate = {
-  all,
   matches,
   minLength,
   maxLength,
diff --git a/web/html/src/components/input/validation/async.stories.tsx b/web/html/src/components/input/validation/async.stories.tsx
index 22a16f9ea5d..313fde4b034 100644
--- a/web/html/src/components/input/validation/async.stories.tsx
+++ b/web/html/src/components/input/validation/async.stories.tsx
@@ -16,7 +16,7 @@ export default () => {
   };
 
   return (
-    <Form model={model} onChange={(newModel) => setModel(newModel)}>
+    <Form model={model} onChange={setModel}>
       <p>Async validation with debounce:</p>
       <Text name="foo" validate={[asyncValidator]} debounceValidate={500} />
     </Form>
diff --git a/web/html/src/components/input/validation/helpers.stories.tsx b/web/html/src/components/input/validation/helpers.stories.tsx
index 7a611551a9d..40224d9469f 100644
--- a/web/html/src/components/input/validation/helpers.stories.tsx
+++ b/web/html/src/components/input/validation/helpers.stories.tsx
@@ -6,11 +6,11 @@ export default () => {
   const [model, setModel] = useState({ foo: "Foo", bar: "3", tea: "Hi" });
 
   return (
-    <Form model={model} onChange={(newModel) => setModel(newModel)}>
+    <Form model={model} onChange={setModel}>
       <p>There are numerous validation helpers:</p>
-      <Text name="foo" validate={[Validate.all([Validate.matches(/^F/), Validate.minLength(3)])]} />
-      <Text name="bar" validate={[Validate.isInt()]} />
-      <Text name="tea" validate={[Validate.matches(/[a-z]/, "Must include a lowercase letter")]} />
+      <Text name="foo" validate={[Validate.matches(/^F/), Validate.minLength(3)]} />
+      <Text name="bar" validate={Validate.isInt()} />
+      <Text name="tea" validate={Validate.matches(/[a-z]/, "Must include a lowercase letter")} />
     </Form>
   );
 };
diff --git a/web/html/src/components/input/validation/multiple-messages.stories.tsx b/web/html/src/components/input/validation/multiple-messages.stories.tsx
index 46f8125fb40..43a2518c194 100644
--- a/web/html/src/components/input/validation/multiple-messages.stories.tsx
+++ b/web/html/src/components/input/validation/multiple-messages.stories.tsx
@@ -12,7 +12,7 @@ export default () => {
   };
 
   return (
-    <Form model={model} onChange={(newModel) => setModel(newModel)}>
+    <Form model={model} onChange={setModel}>
       <p>You can return multiple validation errors:</p>
       <Text name="foo" validate={[validator]} />
     </Form>