diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 2b1973ef370b..d5aa7d1a33d8 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -348,3 +348,4 @@ export type {default as UpdateQuickbooksDesktopExpensesExportDestinationTypePara
 export type {default as ValidateUserAndGetAccessiblePoliciesParams} from './ValidateUserAndGetAccessiblePoliciesParams';
 export type {default as UpdateQuickbooksDesktopCompanyCardExpenseAccountTypeParams} from './UpdateQuickbooksDesktopCompanyCardExpenseAccountTypeParams';
 export type {default as TogglePlatformMuteParams} from './TogglePlatformMuteParams';
+export type {default as JoinAccessiblePolicyParams} from './JoinAccessiblePolicyParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 4a46283d9c3c..d31bf56697a9 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -886,6 +886,8 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SET_INVOICING_TRANSFER_BANK_ACCOUNT]: Parameters.SetInvoicingTransferBankAccountParams;
     [WRITE_COMMANDS.UPDATE_INVOICE_COMPANY_NAME]: Parameters.UpdateInvoiceCompanyNameParams;
     [WRITE_COMMANDS.UPDATE_INVOICE_COMPANY_WEBSITE]: Parameters.UpdateInvoiceCompanyWebsiteParams;
+
+    [WRITE_COMMANDS.JOIN_ACCESSIBLE_POLICY]: Parameters.JoinAccessiblePolicyParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/NavigationUtils.ts b/src/libs/NavigationUtils.ts
index 2f967c2f9a5e..0a352aa61b94 100644
--- a/src/libs/NavigationUtils.ts
+++ b/src/libs/NavigationUtils.ts
@@ -23,6 +23,8 @@ const ONBOARDING_SCREEN_NAMES = new Set([
     SCREENS.ONBOARDING_MODAL.ONBOARDING,
     SCREENS.ONBOARDING.EMPLOYEES,
     SCREENS.ONBOARDING.ACCOUNTING,
+    SCREENS.ONBOARDING.PRIVATE_DOMAIN,
+    SCREENS.ONBOARDING.WORKSPACES,
 ]);
 
 const removePolicyIDParamFromState = (state: State<RootStackParamList>) => {
diff --git a/src/libs/actions/Policy/Member.ts b/src/libs/actions/Policy/Member.ts
index 2287dec6ad98..d8b567666771 100644
--- a/src/libs/actions/Policy/Member.ts
+++ b/src/libs/actions/Policy/Member.ts
@@ -517,7 +517,7 @@ function updateWorkspaceMembersRole(policyID: string, accountIDs: number[], newR
 
 function requestWorkspaceOwnerChange(policyID: string) {
     const policy = getPolicy(policyID);
-    const ownershipChecks = {...policyOwnershipChecks?.[policyID]} ?? {};
+    const ownershipChecks = {...policyOwnershipChecks?.[policyID]};
 
     const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
 
diff --git a/src/pages/OnboardingWorkspaces/types.ts b/src/pages/OnboardingWorkspaces/types.ts
index 0411a1ff8f2e..34c9f20e1ca6 100644
--- a/src/pages/OnboardingWorkspaces/types.ts
+++ b/src/pages/OnboardingWorkspaces/types.ts
@@ -1,3 +1,4 @@
+import type {RouteProp} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
 import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
 import type SCREENS from '@src/SCREENS';
@@ -7,6 +8,8 @@ type OnboardingWorkspacesProps = StackScreenProps<OnboardingModalNavigatorParamL
 type BaseOnboardingWorkspacesProps = {
     /* Whether to use native styles tailored for native devices */
     shouldUseNativeStyles: boolean;
+
+    route: RouteProp<OnboardingModalNavigatorParamList, typeof SCREENS.ONBOARDING.WORKSPACES>;
 };
 
 export type {OnboardingWorkspacesProps, BaseOnboardingWorkspacesProps};