diff --git a/src/pages/ConciergePage.tsx b/src/pages/ConciergePage.tsx
index f87e95dafe30..46f17e76c083 100644
--- a/src/pages/ConciergePage.tsx
+++ b/src/pages/ConciergePage.tsx
@@ -7,6 +7,7 @@ import {withOnyx} from 'react-native-onyx';
 import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
 import ReportHeaderSkeletonView from '@components/ReportHeaderSkeletonView';
 import ScreenWrapper from '@components/ScreenWrapper';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
@@ -31,6 +32,7 @@ type ConciergePageProps = ConciergePageOnyxProps & StackScreenProps<AuthScreensP
 function ConciergePage({session}: ConciergePageProps) {
     const styles = useThemeStyles();
     const isUnmounted = useRef(false);
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     useFocusEffect(() => {
         if (session && 'authToken' in session) {
@@ -56,7 +58,7 @@ function ConciergePage({session}: ConciergePageProps) {
 
     return (
         <ScreenWrapper testID={ConciergePage.displayName}>
-            <View style={[styles.borderBottom]}>
+            <View style={[styles.borderBottom, styles.appContentHeader, !shouldUseNarrowLayout && styles.headerBarDesktopHeight]}>
                 <ReportHeaderSkeletonView onBackButtonPress={Navigation.goBack} />
             </View>
             <ReportActionsSkeletonView />
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 4282eb689d22..2ca54d3a54d7 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -1,7 +1,7 @@
 import React, {memo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {useOnyx, withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import Badge from '@components/Badge';
 import Button from '@components/Button';
 import CaretWrapper from '@components/CaretWrapper';
@@ -19,6 +19,7 @@ import TaskHeaderActionButton from '@components/TaskHeaderActionButton';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
@@ -34,18 +35,7 @@ import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-type HeaderViewOnyxProps = {
-    /** Personal details of all the users */
-    personalDetails: OnyxEntry<OnyxTypes.PersonalDetailsList>;
-
-    /** Parent report */
-    parentReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** The current policy of the report */
-    policy: OnyxEntry<OnyxTypes.Policy>;
-};
-
-type HeaderViewProps = HeaderViewOnyxProps & {
+type HeaderViewProps = {
     /** Toggles the navigationMenu open and closed */
     onNavigationMenuButtonClicked: () => void;
 
@@ -62,9 +52,13 @@ type HeaderViewProps = HeaderViewOnyxProps & {
     shouldUseNarrowLayout?: boolean;
 };
 
-function HeaderView({report, personalDetails, parentReport, parentReportAction, policy, reportID, onNavigationMenuButtonClicked, shouldUseNarrowLayout = false}: HeaderViewProps) {
+function HeaderView({report, parentReportAction, reportID, onNavigationMenuButtonClicked, shouldUseNarrowLayout = false}: HeaderViewProps) {
     const [isDeleteTaskConfirmModalVisible, setIsDeleteTaskConfirmModalVisible] = React.useState(false);
     const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : -1}`);
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID || report?.reportID || '-1'}`);
+    const policy = usePolicy(report?.policyID);
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
 
     const {translate} = useLocalize();
     const theme = useTheme();
@@ -144,163 +138,161 @@ function HeaderView({report, personalDetails, parentReport, parentReportAction,
             dataSet={{dragArea: true}}
         >
             <View style={[styles.appContentHeader, !shouldUseNarrowLayout && styles.headerBarDesktopHeight]}>
-                <View style={[styles.appContentHeaderTitle, !shouldUseNarrowLayout && !isLoading && styles.pl5]}>
-                    {isLoading ? (
-                        <ReportHeaderSkeletonView onBackButtonPress={onNavigationMenuButtonClicked} />
-                    ) : (
-                        <>
-                            {shouldUseNarrowLayout && (
-                                <PressableWithoutFeedback
-                                    onPress={onNavigationMenuButtonClicked}
-                                    style={styles.LHNToggle}
-                                    accessibilityHint={translate('accessibilityHints.navigateToChatsList')}
-                                    accessibilityLabel={translate('common.back')}
-                                    role={CONST.ROLE.BUTTON}
+                {isLoading ? (
+                    <ReportHeaderSkeletonView onBackButtonPress={onNavigationMenuButtonClicked} />
+                ) : (
+                    <View style={[styles.appContentHeaderTitle, !shouldUseNarrowLayout && !isLoading && styles.pl5]}>
+                        {shouldUseNarrowLayout && (
+                            <PressableWithoutFeedback
+                                onPress={onNavigationMenuButtonClicked}
+                                style={styles.LHNToggle}
+                                accessibilityHint={translate('accessibilityHints.navigateToChatsList')}
+                                accessibilityLabel={translate('common.back')}
+                                role={CONST.ROLE.BUTTON}
+                            >
+                                <Tooltip
+                                    text={translate('common.back')}
+                                    shiftVertical={4}
                                 >
-                                    <Tooltip
-                                        text={translate('common.back')}
-                                        shiftVertical={4}
-                                    >
-                                        <View>
-                                            <Icon
-                                                src={Expensicons.BackArrow}
-                                                fill={theme.icon}
-                                            />
-                                        </View>
-                                    </Tooltip>
-                                </PressableWithoutFeedback>
-                            )}
-                            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                <PressableWithoutFeedback
-                                    onPress={() => ReportUtils.navigateToDetailsPage(report)}
-                                    style={[styles.flexRow, styles.alignItemsCenter, styles.flex1]}
-                                    disabled={shouldDisableDetailPage}
-                                    accessibilityLabel={title}
-                                    role={CONST.ROLE.BUTTON}
+                                    <View>
+                                        <Icon
+                                            src={Expensicons.BackArrow}
+                                            fill={theme.icon}
+                                        />
+                                    </View>
+                                </Tooltip>
+                            </PressableWithoutFeedback>
+                        )}
+                        <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                            <PressableWithoutFeedback
+                                onPress={() => ReportUtils.navigateToDetailsPage(report)}
+                                style={[styles.flexRow, styles.alignItemsCenter, styles.flex1]}
+                                disabled={shouldDisableDetailPage}
+                                accessibilityLabel={title}
+                                role={CONST.ROLE.BUTTON}
+                            >
+                                {shouldShowSubscript ? (
+                                    <SubscriptAvatar
+                                        mainAvatar={icons[0]}
+                                        secondaryAvatar={icons[1]}
+                                        size={defaultSubscriptSize}
+                                    />
+                                ) : (
+                                    <OfflineWithFeedback pendingAction={report.pendingFields?.avatar}>
+                                        <MultipleAvatars
+                                            icons={icons}
+                                            shouldShowTooltip={!isChatRoom || isChatThread}
+                                        />
+                                    </OfflineWithFeedback>
+                                )}
+                                <View
+                                    fsClass="fs-unmask"
+                                    style={[styles.flex1, styles.flexColumn]}
                                 >
-                                    {shouldShowSubscript ? (
-                                        <SubscriptAvatar
-                                            mainAvatar={icons[0]}
-                                            secondaryAvatar={icons[1]}
-                                            size={defaultSubscriptSize}
+                                    <CaretWrapper>
+                                        <DisplayNames
+                                            fullTitle={title}
+                                            displayNamesWithTooltips={displayNamesWithTooltips}
+                                            tooltipEnabled
+                                            numberOfLines={1}
+                                            textStyles={[styles.headerText, styles.pre]}
+                                            shouldUseFullTitle={isChatRoom || isPolicyExpenseChat || isChatThread || isTaskReport || shouldUseGroupTitle}
+                                            renderAdditionalText={renderAdditionalText}
+                                        />
+                                    </CaretWrapper>
+                                    {!isEmptyObject(parentNavigationSubtitleData) && (
+                                        <ParentNavigationSubtitle
+                                            parentNavigationSubtitleData={parentNavigationSubtitleData}
+                                            parentReportID={report.parentReportID}
+                                            parentReportActionID={report.parentReportActionID}
+                                            pressableStyles={[styles.alignSelfStart, styles.mw100]}
                                         />
-                                    ) : (
-                                        <OfflineWithFeedback pendingAction={report.pendingFields?.avatar}>
-                                            <MultipleAvatars
-                                                icons={icons}
-                                                shouldShowTooltip={!isChatRoom || isChatThread}
-                                            />
-                                        </OfflineWithFeedback>
                                     )}
-                                    <View
-                                        fsClass="fs-unmask"
-                                        style={[styles.flex1, styles.flexColumn]}
-                                    >
-                                        <CaretWrapper>
-                                            <DisplayNames
-                                                fullTitle={title}
-                                                displayNamesWithTooltips={displayNamesWithTooltips}
-                                                tooltipEnabled
-                                                numberOfLines={1}
-                                                textStyles={[styles.headerText, styles.pre]}
-                                                shouldUseFullTitle={isChatRoom || isPolicyExpenseChat || isChatThread || isTaskReport || shouldUseGroupTitle}
-                                                renderAdditionalText={renderAdditionalText}
-                                            />
-                                        </CaretWrapper>
-                                        {!isEmptyObject(parentNavigationSubtitleData) && (
-                                            <ParentNavigationSubtitle
-                                                parentNavigationSubtitleData={parentNavigationSubtitleData}
-                                                parentReportID={report.parentReportID}
-                                                parentReportActionID={report.parentReportActionID}
-                                                pressableStyles={[styles.alignSelfStart, styles.mw100]}
-                                            />
-                                        )}
-                                        {shouldShowSubtitle() && (
+                                    {shouldShowSubtitle() && (
+                                        <Text
+                                            style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
+                                            numberOfLines={1}
+                                        >
+                                            {subtitle}
+                                        </Text>
+                                    )}
+                                    {isChatRoom && !!reportDescription && isEmptyObject(parentNavigationSubtitleData) && (
+                                        <PressableWithoutFeedback
+                                            onPress={() => {
+                                                if (ReportUtils.canEditReportDescription(report, policy)) {
+                                                    Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(reportID));
+                                                    return;
+                                                }
+                                                Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
+                                            }}
+                                            style={[styles.alignSelfStart, styles.mw100]}
+                                            accessibilityLabel={translate('reportDescriptionPage.roomDescription')}
+                                        >
                                             <Text
                                                 style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
                                                 numberOfLines={1}
                                             >
-                                                {subtitle}
+                                                {reportDescription}
                                             </Text>
-                                        )}
-                                        {isChatRoom && !!reportDescription && isEmptyObject(parentNavigationSubtitleData) && (
-                                            <PressableWithoutFeedback
-                                                onPress={() => {
-                                                    if (ReportUtils.canEditReportDescription(report, policy)) {
-                                                        Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(reportID));
-                                                        return;
-                                                    }
-                                                    Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
-                                                }}
-                                                style={[styles.alignSelfStart, styles.mw100]}
-                                                accessibilityLabel={translate('reportDescriptionPage.roomDescription')}
-                                            >
-                                                <Text
-                                                    style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
-                                                    numberOfLines={1}
-                                                >
-                                                    {reportDescription}
-                                                </Text>
-                                            </PressableWithoutFeedback>
-                                        )}
-                                        {isPolicyExpenseChat && !!policyDescription && isEmptyObject(parentNavigationSubtitleData) && (
-                                            <PressableWithoutFeedback
-                                                onPress={() => {
-                                                    if (ReportUtils.canEditPolicyDescription(policy)) {
-                                                        Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(report.policyID ?? '-1'));
-                                                        return;
-                                                    }
-                                                    Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
-                                                }}
-                                                style={[styles.alignSelfStart, styles.mw100]}
-                                                accessibilityLabel={translate('workspace.editor.descriptionInputLabel')}
-                                            >
-                                                <Text
-                                                    style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
-                                                    numberOfLines={1}
-                                                >
-                                                    {policyDescription}
-                                                </Text>
-                                            </PressableWithoutFeedback>
-                                        )}
-                                    </View>
-                                    {brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && (
-                                        <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
-                                            <Icon
-                                                src={Expensicons.DotIndicator}
-                                                fill={theme.danger}
-                                            />
-                                        </View>
+                                        </PressableWithoutFeedback>
                                     )}
-                                </PressableWithoutFeedback>
-                                <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
-                                    {ReportUtils.isChatUsedForOnboarding(report) && SubscriptionUtils.isUserOnFreeTrial() && (
-                                        <Badge
-                                            success
-                                            text={translate('subscription.badge.freeTrial', {numOfDays: SubscriptionUtils.calculateRemainingFreeTrialDays()})}
-                                        />
+                                    {isPolicyExpenseChat && !!policyDescription && isEmptyObject(parentNavigationSubtitleData) && (
+                                        <PressableWithoutFeedback
+                                            onPress={() => {
+                                                if (ReportUtils.canEditPolicyDescription(policy)) {
+                                                    Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(report.policyID ?? '-1'));
+                                                    return;
+                                                }
+                                                Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
+                                            }}
+                                            style={[styles.alignSelfStart, styles.mw100]}
+                                            accessibilityLabel={translate('workspace.editor.descriptionInputLabel')}
+                                        >
+                                            <Text
+                                                style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
+                                                numberOfLines={1}
+                                            >
+                                                {policyDescription}
+                                            </Text>
+                                        </PressableWithoutFeedback>
                                     )}
-                                    {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
-                                    {canJoin && !shouldUseNarrowLayout && joinButton}
                                 </View>
+                                {brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && (
+                                    <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
+                                        <Icon
+                                            src={Expensicons.DotIndicator}
+                                            fill={theme.danger}
+                                        />
+                                    </View>
+                                )}
+                            </PressableWithoutFeedback>
+                            <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
+                                {ReportUtils.isChatUsedForOnboarding(report) && SubscriptionUtils.isUserOnFreeTrial() && (
+                                    <Badge
+                                        success
+                                        text={translate('subscription.badge.freeTrial', {numOfDays: SubscriptionUtils.calculateRemainingFreeTrialDays()})}
+                                    />
+                                )}
+                                {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
+                                {canJoin && !shouldUseNarrowLayout && joinButton}
                             </View>
-                            <ConfirmModal
-                                isVisible={isDeleteTaskConfirmModalVisible}
-                                onConfirm={() => {
-                                    setIsDeleteTaskConfirmModalVisible(false);
-                                    Task.deleteTask(report);
-                                }}
-                                onCancel={() => setIsDeleteTaskConfirmModalVisible(false)}
-                                title={translate('task.deleteTask')}
-                                prompt={translate('task.deleteConfirmation')}
-                                confirmText={translate('common.delete')}
-                                cancelText={translate('common.cancel')}
-                                danger
-                                shouldEnableNewFocusManagement
-                            />
-                        </>
-                    )}
-                </View>
+                        </View>
+                        <ConfirmModal
+                            isVisible={isDeleteTaskConfirmModalVisible}
+                            onConfirm={() => {
+                                setIsDeleteTaskConfirmModalVisible(false);
+                                Task.deleteTask(report);
+                            }}
+                            onCancel={() => setIsDeleteTaskConfirmModalVisible(false)}
+                            title={translate('task.deleteTask')}
+                            prompt={translate('task.deleteConfirmation')}
+                            confirmText={translate('common.delete')}
+                            cancelText={translate('common.cancel')}
+                            danger
+                            shouldEnableNewFocusManagement
+                        />
+                    </View>
+                )}
             </View>
             {!isLoading && canJoin && shouldUseNarrowLayout && <View style={[styles.ph5, styles.pb2]}>{joinButton}</View>}
         </View>
@@ -309,16 +301,4 @@ function HeaderView({report, personalDetails, parentReport, parentReportAction,
 
 HeaderView.displayName = 'HeaderView';
 
-export default memo(
-    withOnyx<HeaderViewProps, HeaderViewOnyxProps>({
-        parentReport: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID ?? report?.reportID}`,
-        },
-        policy: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
-        },
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-    })(HeaderView),
-);
+export default memo(HeaderView);