diff --git a/packages/form-core/src/FieldApi.ts b/packages/form-core/src/FieldApi.ts
index a39f7fc8..e4ffdb22 100644
--- a/packages/form-core/src/FieldApi.ts
+++ b/packages/form-core/src/FieldApi.ts
@@ -42,19 +42,10 @@ export type FieldValidateOrFn<
     | Validator<TParentData, unknown>
     | undefined = undefined,
   TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>,
-> = TFieldValidator extends Validator<TData, infer TFN>
-  ?
-      | TFN
-      | FieldValidateFn<
-          TParentData,
-          TName,
-          TFieldValidator,
-          TFormValidator,
-          TData
-        >
-  : TFormValidator extends Validator<TParentData, infer FFN>
+> =
+  TFieldValidator extends Validator<TData, infer TFN>
     ?
-        | FFN
+        | TFN
         | FieldValidateFn<
             TParentData,
             TName,
@@ -62,13 +53,23 @@ export type FieldValidateOrFn<
             TFormValidator,
             TData
           >
-    : FieldValidateFn<
-        TParentData,
-        TName,
-        TFieldValidator,
-        TFormValidator,
-        TData
-      >
+    : TFormValidator extends Validator<TParentData, infer FFN>
+      ?
+          | FFN
+          | FieldValidateFn<
+              TParentData,
+              TName,
+              TFieldValidator,
+              TFormValidator,
+              TData
+            >
+      : FieldValidateFn<
+          TParentData,
+          TName,
+          TFieldValidator,
+          TFormValidator,
+          TData
+        >
 
 /**
  * @private
@@ -102,19 +103,10 @@ export type FieldAsyncValidateOrFn<
     | Validator<TParentData, unknown>
     | undefined = undefined,
   TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>,
-> = TFieldValidator extends Validator<TData, infer TFN>
-  ?
-      | TFN
-      | FieldValidateAsyncFn<
-          TParentData,
-          TName,
-          TFieldValidator,
-          TFormValidator,
-          TData
-        >
-  : TFormValidator extends Validator<TParentData, infer FFN>
+> =
+  TFieldValidator extends Validator<TData, infer TFN>
     ?
-        | FFN
+        | TFN
         | FieldValidateAsyncFn<
             TParentData,
             TName,
@@ -122,13 +114,23 @@ export type FieldAsyncValidateOrFn<
             TFormValidator,
             TData
           >
-    : FieldValidateAsyncFn<
-        TParentData,
-        TName,
-        TFieldValidator,
-        TFormValidator,
-        TData
-      >
+    : TFormValidator extends Validator<TParentData, infer FFN>
+      ?
+          | FFN
+          | FieldValidateAsyncFn<
+              TParentData,
+              TName,
+              TFieldValidator,
+              TFormValidator,
+              TData
+            >
+      : FieldValidateAsyncFn<
+          TParentData,
+          TName,
+          TFieldValidator,
+          TFormValidator,
+          TData
+        >
 
 export interface FieldValidators<
   TParentData,