diff --git a/.changeset/update-firstargument-implementation.md b/.changeset/update-firstargument-implementation.md
new file mode 100644
index 00000000..b9a16360
--- /dev/null
+++ b/.changeset/update-firstargument-implementation.md
@@ -0,0 +1,6 @@
+---
+"@dnd-kit/utilities": patch
+"@dnd-kit/modifiers": patch
+---
+
+Update implementation of FirstArgument
diff --git a/packages/utilities/src/index.ts b/packages/utilities/src/index.ts
index bd3bfabd..1713a7f5 100644
--- a/packages/utilities/src/index.ts
+++ b/packages/utilities/src/index.ts
@@ -10,4 +10,4 @@ export {
 export {add, subtract} from './adjustment';
 export {CSS, Transform, Transition} from './css';
 export {canUseDOM} from './execution-context';
-export type {Arguments, ArgumentAtIndex, FirstArgument, Without} from './types';
+export type {Arguments, FirstArgument, Without} from './types';
diff --git a/packages/utilities/src/types.ts b/packages/utilities/src/types.ts
index 173b18a6..a7c2bb95 100644
--- a/packages/utilities/src/types.ts
+++ b/packages/utilities/src/types.ts
@@ -1,10 +1,10 @@
 export type Arguments<T> = T extends (...args: infer U) => any ? U : never;
 
-export type ArgumentAtIndex<
-  Func,
-  Index extends keyof Arguments<Func>
-> = Arguments<Func>[Index];
-
-export type FirstArgument<T> = ArgumentAtIndex<T, 0>;
+export type FirstArgument<T> = T extends (
+  firstArg: infer U,
+  ...args: Array<any>
+) => any
+  ? U
+  : never;
 
 export type Without<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;