diff --git a/src/components/Form/inputs/AddDebitCardForm.ts b/src/components/Form/inputs/AddDebitCardForm.ts
index f62e104bf2bc..0c874c20dfb5 100644
--- a/src/components/Form/inputs/AddDebitCardForm.ts
+++ b/src/components/Form/inputs/AddDebitCardForm.ts
@@ -16,14 +16,14 @@ type AddDebitCardForm = Form<{
     /** Whether the form has been submitted */
     [INPUT_IDS.SETUP_COMPLETE]: boolean;
 
-    [INPUT_IDS.NAME_ON_CARD]: string;
-    [INPUT_IDS.CARD_NUMBER]: string;
-    [INPUT_IDS.EXPIRATION_DATE]: string;
-    [INPUT_IDS.SECURITY_CODE]: string;
-    [INPUT_IDS.ADDRESS_STREET]: string;
-    [INPUT_IDS.ADDRESS_ZIP_CODE]: string;
-    [INPUT_IDS.ADDRESS_STATE]: string;
-    [INPUT_IDS.ACCEPT_TERMS]: string;
+    [INPUT_IDS.NAME_ON_CARD]?: string;
+    [INPUT_IDS.CARD_NUMBER]?: string;
+    [INPUT_IDS.EXPIRATION_DATE]?: string;
+    [INPUT_IDS.SECURITY_CODE]?: string;
+    [INPUT_IDS.ADDRESS_STREET]?: string;
+    [INPUT_IDS.ADDRESS_ZIP_CODE]?: string;
+    [INPUT_IDS.ADDRESS_STATE]?: string;
+    [INPUT_IDS.ACCEPT_TERMS]?: string;
 }>;
 
 export type {AddDebitCardForm};
diff --git a/src/components/Form/inputs/NewRoomForm.ts b/src/components/Form/inputs/NewRoomForm.ts
index d0403facc6a6..e5ad0bb260e5 100644
--- a/src/components/Form/inputs/NewRoomForm.ts
+++ b/src/components/Form/inputs/NewRoomForm.ts
@@ -9,11 +9,11 @@ const INPUT_IDS = {
 } as const;
 
 type NewRoomForm = Form<{
-    [INPUT_IDS.ROOM_NAME]: string;
-    [INPUT_IDS.REPORT_DESCRIPTION]: string;
-    [INPUT_IDS.POLICY_ID]: string;
-    [INPUT_IDS.WRITE_CAPABILITY]: string;
-    [INPUT_IDS.VISIBILITY]: string;
+    [INPUT_IDS.ROOM_NAME]?: string;
+    [INPUT_IDS.REPORT_DESCRIPTION]?: string;
+    [INPUT_IDS.POLICY_ID]?: string;
+    [INPUT_IDS.WRITE_CAPABILITY]?: string;
+    [INPUT_IDS.VISIBILITY]?: string;
 }>;
 
 export type {NewRoomForm};
diff --git a/src/libs/actions/PersonalDetails.ts b/src/libs/actions/PersonalDetails.ts
index 26c8937de3aa..904b61f2039f 100644
--- a/src/libs/actions/PersonalDetails.ts
+++ b/src/libs/actions/PersonalDetails.ts
@@ -1,5 +1,6 @@
 import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+import type {DateOfBirthForm} from '@components/Form/inputs';
 import * as API from '@libs/API';
 import type {
     OpenPublicProfilePageParams,
@@ -21,7 +22,7 @@ import * as UserUtils from '@libs/UserUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {DateOfBirthForm, PersonalDetails, PersonalDetailsList, PrivatePersonalDetails} from '@src/types/onyx';
+import type {PersonalDetails, PersonalDetailsList, PrivatePersonalDetails} from '@src/types/onyx';
 import type {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails';
 import * as Session from './Session';