diff --git a/js/libs/ui-shared/src/controls/NumberControl.tsx b/js/libs/ui-shared/src/controls/NumberControl.tsx
index 5cbe12e963..24e9db049e 100644
--- a/js/libs/ui-shared/src/controls/NumberControl.tsx
+++ b/js/libs/ui-shared/src/controls/NumberControl.tsx
@@ -21,7 +21,7 @@ export type NumberControlOption = {
 export type NumberControlProps<
   T extends FieldValues,
   P extends FieldPath<T> = FieldPath<T>,
-> = Omit<NumberInputProps, "name"> &
+> = Omit<NumberInputProps, "name" | "isRequired" | "required"> &
   UseControllerProps<T, P> & {
     name: string;
     label?: string;
diff --git a/js/libs/ui-shared/src/controls/SwitchControl.tsx b/js/libs/ui-shared/src/controls/SwitchControl.tsx
index 509d73b493..12f0290cc1 100644
--- a/js/libs/ui-shared/src/controls/SwitchControl.tsx
+++ b/js/libs/ui-shared/src/controls/SwitchControl.tsx
@@ -12,7 +12,7 @@ import { FormLabel } from "./FormLabel";
 export type SwitchControlProps<
   T extends FieldValues,
   P extends FieldPath<T> = FieldPath<T>,
-> = SwitchProps &
+> = Omit<SwitchProps, "name"> &
   UseControllerProps<T, P> & {
     name: string;
     label?: string;
diff --git a/js/libs/ui-shared/src/controls/TextControl.tsx b/js/libs/ui-shared/src/controls/TextControl.tsx
index e95796dabc..2f9560a7f2 100644
--- a/js/libs/ui-shared/src/controls/TextControl.tsx
+++ b/js/libs/ui-shared/src/controls/TextControl.tsx
@@ -14,7 +14,7 @@ export type TextControlProps<
   T extends FieldValues,
   P extends FieldPath<T> = FieldPath<T>,
 > = UseControllerProps<T, P> &
-  TextInputProps & {
+  Omit<TextInputProps, "name" | "isRequired" | "required"> & {
     label: string;
     labelIcon?: string;
     isDisabled?: boolean;