diff --git a/src/App.tsx b/src/App.tsx
index 1bf42a54d2a5..e0f8d3ec96cf 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -9,6 +9,7 @@ import {ActionSheetAwareScrollViewProvider} from './components/ActionSheetAwareS
 import ActiveElementRoleProvider from './components/ActiveElementRoleProvider';
 import ColorSchemeWrapper from './components/ColorSchemeWrapper';
 import ComposeProviders from './components/ComposeProviders';
+import {CurrentUserPersonalDetailsProvider} from './components/CurrentUserPersonalDetailsProvider';
 import CustomStatusBarAndBackground from './components/CustomStatusBarAndBackground';
 import CustomStatusBarAndBackgroundContextProvider from './components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider';
 import ErrorBoundary from './components/ErrorBoundary';
@@ -88,6 +89,7 @@ function App() {
                                 <ComposeProviders
                                     components={[
                                         OnyxListItemProvider,
+                                        CurrentUserPersonalDetailsProvider,
                                         ThemeProvider,
                                         ThemeStylesProvider,
                                         ThemeIllustrationsProvider,
diff --git a/src/components/CurrentUserPersonalDetailsProvider.tsx b/src/components/CurrentUserPersonalDetailsProvider.tsx
new file mode 100644
index 000000000000..876cbdbac483
--- /dev/null
+++ b/src/components/CurrentUserPersonalDetailsProvider.tsx
@@ -0,0 +1,31 @@
+import React, {createContext, useCallback} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import useOnyx from '@hooks/useOnyx';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {PersonalDetails, PersonalDetailsList} from '@src/types/onyx';
+import {useSession} from './OnyxListItemProvider';
+
+const defaultCurrentUserPersonalDetails: PersonalDetails = {
+    accountID: CONST.DEFAULT_NUMBER_ID,
+};
+
+const CurrentUserPersonalDetailsContext = createContext<PersonalDetails>(defaultCurrentUserPersonalDetails);
+
+function CurrentUserPersonalDetailsProvider({children}: {children: React.ReactNode}) {
+    const session = useSession();
+    const userAccountID = session?.accountID ?? CONST.DEFAULT_NUMBER_ID;
+    const userAccountSelector = useCallback(
+        (allPersonalDetails: OnyxEntry<PersonalDetailsList>): PersonalDetails => {
+            const personalDetailsForUser = allPersonalDetails?.[userAccountID] ?? ({} as PersonalDetails);
+            personalDetailsForUser.accountID = userAccountID;
+            return personalDetailsForUser;
+        },
+        [userAccountID],
+    );
+    const [currentUserPersonalDetails = defaultCurrentUserPersonalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: userAccountSelector, canBeMissing: true});
+
+    return <CurrentUserPersonalDetailsContext.Provider value={currentUserPersonalDetails}>{children}</CurrentUserPersonalDetailsContext.Provider>;
+}
+
+export {CurrentUserPersonalDetailsContext, CurrentUserPersonalDetailsProvider};
diff --git a/src/hooks/useCurrentUserPersonalDetails.ts b/src/hooks/useCurrentUserPersonalDetails.ts
index fadab893f113..7ba41727d076 100644
--- a/src/hooks/useCurrentUserPersonalDetails.ts
+++ b/src/hooks/useCurrentUserPersonalDetails.ts
@@ -1,16 +1,8 @@
-import {useMemo} from 'react';
-import {usePersonalDetails, useSession} from '@components/OnyxListItemProvider';
-import CONST from '@src/CONST';
-import type {PersonalDetails} from '@src/types/onyx';
+import {useContext} from 'react';
+import {CurrentUserPersonalDetailsContext} from '@components/CurrentUserPersonalDetailsProvider';
 
 function useCurrentUserPersonalDetails() {
-    const session = useSession();
-    const personalDetails = usePersonalDetails();
-    const accountID = session?.accountID ?? CONST.DEFAULT_NUMBER_ID;
-    const accountPersonalDetails = personalDetails?.[accountID];
-    const currentUserPersonalDetails: PersonalDetails = useMemo(() => ({...accountPersonalDetails, accountID}), [accountPersonalDetails, accountID]);
-
-    return currentUserPersonalDetails;
+    return useContext(CurrentUserPersonalDetailsContext);
 }
 
 export default useCurrentUserPersonalDetails;
diff --git a/tests/ui/PersonalDetailsOnboarding.tsx b/tests/ui/PersonalDetailsOnboarding.tsx
index 9436e5543697..e9326a0eab6e 100644
--- a/tests/ui/PersonalDetailsOnboarding.tsx
+++ b/tests/ui/PersonalDetailsOnboarding.tsx
@@ -4,6 +4,7 @@ import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-na
 import React from 'react';
 import Onyx from 'react-native-onyx';
 import ComposeProviders from '@components/ComposeProviders';
+import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
@@ -41,7 +42,7 @@ const renderOnboardingPersonalDetailsPage = (
     initialParams: OnboardingModalNavigatorParamList[typeof SCREENS.ONBOARDING.PERSONAL_DETAILS],
 ) => {
     return render(
-        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
+        <ComposeProviders components={[OnyxListItemProvider, CurrentUserPersonalDetailsProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
             <PortalProvider>
                 <NavigationContainer>
                     <Stack.Navigator initialRouteName={initialRouteName}>
diff --git a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
index 4e30c225c83a..f1014384c7e6 100644
--- a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
+++ b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
@@ -1,6 +1,7 @@
 import {fireEvent, render, screen} from '@testing-library/react-native';
 import React from 'react';
 import Onyx from 'react-native-onyx';
+import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import {translateLocal} from '@libs/Localize';
@@ -101,22 +102,24 @@ describe('IOURequestStepConfirmationPageTest', () => {
 
         render(
             <OnyxListItemProvider>
-                <LocaleContextProvider>
-                    <IOURequestStepConfirmationWithWritableReportOrNotFound
-                        route={{
-                            key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
-                            name: 'Money_Request_Step_Confirmation',
-                            params: {
-                                action: 'create',
-                                iouType: 'invoice',
-                                transactionID: TRANSACTION_ID,
-                                reportID: routeReportID,
-                            },
-                        }}
-                        // @ts-expect-error we don't need navigation param here.
-                        navigation={undefined}
-                    />
-                </LocaleContextProvider>
+                <CurrentUserPersonalDetailsProvider>
+                    <LocaleContextProvider>
+                        <IOURequestStepConfirmationWithWritableReportOrNotFound
+                            route={{
+                                key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
+                                name: 'Money_Request_Step_Confirmation',
+                                params: {
+                                    action: 'create',
+                                    iouType: 'invoice',
+                                    transactionID: TRANSACTION_ID,
+                                    reportID: routeReportID,
+                                },
+                            }}
+                            // @ts-expect-error we don't need navigation param here.
+                            navigation={undefined}
+                        />
+                    </LocaleContextProvider>
+                </CurrentUserPersonalDetailsProvider>
             </OnyxListItemProvider>,
         );
 
@@ -138,22 +141,24 @@ describe('IOURequestStepConfirmationPageTest', () => {
 
         render(
             <OnyxListItemProvider>
-                <LocaleContextProvider>
-                    <IOURequestStepConfirmationWithWritableReportOrNotFound
-                        route={{
-                            key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
-                            name: 'Money_Request_Step_Confirmation',
-                            params: {
-                                action: 'create',
-                                iouType: 'split',
-                                transactionID: TRANSACTION_ID,
-                                reportID: REPORT_ID,
-                            },
-                        }}
-                        // @ts-expect-error we don't need navigation param here.
-                        navigation={undefined}
-                    />
-                </LocaleContextProvider>
+                <CurrentUserPersonalDetailsProvider>
+                    <LocaleContextProvider>
+                        <IOURequestStepConfirmationWithWritableReportOrNotFound
+                            route={{
+                                key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
+                                name: 'Money_Request_Step_Confirmation',
+                                params: {
+                                    action: 'create',
+                                    iouType: 'split',
+                                    transactionID: TRANSACTION_ID,
+                                    reportID: REPORT_ID,
+                                },
+                            }}
+                            // @ts-expect-error we don't need navigation param here.
+                            navigation={undefined}
+                        />
+                    </LocaleContextProvider>
+                </CurrentUserPersonalDetailsProvider>
             </OnyxListItemProvider>,
         );
 
@@ -182,22 +187,24 @@ describe('IOURequestStepConfirmationPageTest', () => {
 
         render(
             <OnyxListItemProvider>
-                <LocaleContextProvider>
-                    <IOURequestStepConfirmationWithWritableReportOrNotFound
-                        route={{
-                            key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
-                            name: 'Money_Request_Step_Confirmation',
-                            params: {
-                                action: 'create',
-                                iouType: 'split',
-                                transactionID: TRANSACTION_ID,
-                                reportID: REPORT_ID,
-                            },
-                        }}
-                        // @ts-expect-error we don't need navigation param here.
-                        navigation={undefined}
-                    />
-                </LocaleContextProvider>
+                <CurrentUserPersonalDetailsProvider>
+                    <LocaleContextProvider>
+                        <IOURequestStepConfirmationWithWritableReportOrNotFound
+                            route={{
+                                key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
+                                name: 'Money_Request_Step_Confirmation',
+                                params: {
+                                    action: 'create',
+                                    iouType: 'split',
+                                    transactionID: TRANSACTION_ID,
+                                    reportID: REPORT_ID,
+                                },
+                            }}
+                            // @ts-expect-error we don't need navigation param here.
+                            navigation={undefined}
+                        />
+                    </LocaleContextProvider>
+                </CurrentUserPersonalDetailsProvider>
             </OnyxListItemProvider>,
         );