diff --git a/src/pages/inbox/report/ReportActionsList.tsx b/src/pages/inbox/report/ReportActionsList.tsx
index 6dcfc64e201e..1e9dd91d3ff6 100644
--- a/src/pages/inbox/report/ReportActionsList.tsx
+++ b/src/pages/inbox/report/ReportActionsList.tsx
@@ -6,14 +6,12 @@ import type {LayoutChangeEvent, NativeScrollEvent, NativeSyntheticEvent} from 'r
 import {DeviceEventEmitter, InteractionManager, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {renderScrollComponent as renderActionSheetAwareScrollView} from '@components/ActionSheetAwareScrollView';
-import Button from '@components/Button';
 import InvertedFlashList from '@components/FlashList/InvertedFlashList';
 import getShowScrollIndicator from '@components/FlashList/InvertedFlashList/getShowScrollIndicator';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useIsAnonymousUser from '@hooks/useIsAnonymousUser';
-import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetworkWithOfflineStatus from '@hooks/useNetworkWithOfflineStatus';
 import useOnyx from '@hooks/useOnyx';
@@ -62,7 +60,6 @@ import {
 } from '@libs/ReportUtils';
 import Visibility from '@libs/Visibility';
 import type {ReportsSplitNavigatorParamList} from '@navigation/types';
-import ConciergeThinkingMessage from '@pages/home/report/ConciergeThinkingMessage';
 import {ActionListContext} from '@pages/inbox/ReportScreenContext';
 import variables from '@styles/variables';
 import {openReport, readNewestAction, subscribeToNewActionEvent} from '@userActions/Report';
@@ -74,9 +71,10 @@ import type * as OnyxTypes from '@src/types/onyx';
 import FloatingMessageCounter from './FloatingMessageCounter';
 import getInitialNumToRender from './getInitialNumReportActionsToRender';
 import getReportActionsListInitialNumToRender from './getReportActionsListInitialNumToRender';
-import ListBoundaryLoader from './ListBoundaryLoader';
+import ReportActionsListHeader from './ReportActionsListHeader';
 import ReportActionsListItemRenderer from './ReportActionsListItemRenderer';
 import {getUnreadMarkerReportAction} from './shouldDisplayNewMarkerOnReportAction';
+import ShowPreviousMessagesButton from './ShowPreviousMessagesButton';
 import StaticReportActionsPreview from './StaticReportActionsPreview';
 import useReportUnreadMessageScrollTracking from './useReportUnreadMessageScrollTracking';
 
@@ -120,9 +118,6 @@ type ReportActionsListProps = {
     /** Whether the optimistic CREATED report action was added */
     hasCreatedActionAdded?: boolean;
 
-    /** Whether this is a Concierge chat in the side panel */
-    isConciergeSidePanel?: boolean;
-
     /** Whether the chat history is hidden (concierge side panel fresh state) */
     showHiddenHistory?: boolean;
 
@@ -166,7 +161,6 @@ function ReportActionsList({
     listID,
     parentReportActionForTransactionThread,
     hasCreatedActionAdded,
-    isConciergeSidePanel,
     showHiddenHistory,
     hasPreviousMessages,
     onShowPreviousMessages,
@@ -177,7 +171,6 @@ function ReportActionsList({
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const expensifyIcons = useMemoizedLazyExpensifyIcons(['UpArrow']);
     const {windowHeight} = useWindowDimensions();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
 
@@ -701,7 +694,6 @@ function ReportActionsList({
     const renderItem = useCallback(
         ({item: reportAction, index}: ListRenderItemInfo<OnyxTypes.ReportAction>) => {
             const originalReportID = getOriginalReportID(report.reportID, reportAction, reportActionsFromOnyx);
-            const showPreviousMessagesButton = reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED && !!isConciergeSidePanel && !!showHiddenHistory && !!hasPreviousMessages;
 
             // Use the action's actual index in sortedVisibleReportActions rather than the FlashList-provided index,
             // because useFlashListScrollKey may slice the data for deep-link scroll positioning, making the
@@ -735,21 +727,13 @@ function ReportActionsList({
                         reportNameValuePairsOrigin={reportNameValuePairs?.origin}
                         reportNameValuePairsOriginalID={reportNameValuePairs?.originalID}
                     />
-                    {showPreviousMessagesButton && (
-                        <View style={[styles.flexRow, styles.alignItemsCenter, styles.pv3, styles.mh5]}>
-                            <View style={[styles.threadDividerLine, styles.ml0, styles.mr0, styles.flexGrow1]} />
-                            <View>
-                                <Button
-                                    small
-                                    shouldShowRightIcon
-                                    iconRight={expensifyIcons.UpArrow}
-                                    text={translate('common.concierge.showHistory')}
-                                    onPress={onShowPreviousMessages}
-                                />
-                            </View>
-                            <View style={[styles.threadDividerLine, styles.ml0, styles.mr0, styles.flexGrow1]} />
-                        </View>
-                    )}
+                    <ShowPreviousMessagesButton
+                        reportID={report.reportID}
+                        actionType={reportAction.actionName}
+                        hasPreviousMessages={!!hasPreviousMessages}
+                        showFullHistory={!showHiddenHistory}
+                        onPress={onShowPreviousMessages}
+                    />
                 </>
             );
         },
@@ -773,13 +757,9 @@ function ReportActionsList({
             reportNameValuePairs?.origin,
             reportNameValuePairs?.originalID,
             reportActionsFromOnyx,
-            isConciergeSidePanel,
             showHiddenHistory,
             hasPreviousMessages,
             onShowPreviousMessages,
-            styles,
-            translate,
-            expensifyIcons.UpArrow,
         ],
     );
 
@@ -821,15 +801,12 @@ function ReportActionsList({
         }
 
         return (
-            <>
-                <ConciergeThinkingMessage report={report} />
-                <ListBoundaryLoader
-                    type={CONST.LIST_COMPONENTS.HEADER}
-                    onRetry={retryLoadNewerChatsError}
-                />
-            </>
+            <ReportActionsListHeader
+                reportID={report.reportID}
+                onRetry={retryLoadNewerChatsError}
+            />
         );
-    }, [canShowHeader, report, retryLoadNewerChatsError]);
+    }, [canShowHeader, report.reportID, retryLoadNewerChatsError]);
 
     const shouldShowSkeleton = isOffline && !sortedVisibleReportActions.some((action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
 
diff --git a/src/pages/inbox/report/ReportActionsListHeader.tsx b/src/pages/inbox/report/ReportActionsListHeader.tsx
new file mode 100644
index 000000000000..77d2c617cff5
--- /dev/null
+++ b/src/pages/inbox/report/ReportActionsListHeader.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import useOnyx from '@hooks/useOnyx';
+import ConciergeThinkingMessage from '@pages/home/report/ConciergeThinkingMessage';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ListBoundaryLoader from './ListBoundaryLoader';
+
+type ReportActionsListHeaderProps = {
+    /** The ID of the report being displayed */
+    reportID: string;
+
+    /** Callback to retry loading newer chats after an error */
+    onRetry: () => void;
+};
+
+function ReportActionsListHeader({reportID, onRetry}: ReportActionsListHeaderProps) {
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+
+    return (
+        <>
+            <ConciergeThinkingMessage report={report} />
+            <ListBoundaryLoader
+                type={CONST.LIST_COMPONENTS.HEADER}
+                onRetry={onRetry}
+            />
+        </>
+    );
+}
+
+export default ReportActionsListHeader;
diff --git a/src/pages/inbox/report/ReportActionsView.tsx b/src/pages/inbox/report/ReportActionsView.tsx
index 01209272079c..a4a02894fc57 100755
--- a/src/pages/inbox/report/ReportActionsView.tsx
+++ b/src/pages/inbox/report/ReportActionsView.tsx
@@ -365,7 +365,6 @@ function ReportActionsView({reportID, onLayout}: ReportActionsViewProps) {
                 loadNewerChats={loadNewerChats}
                 listID={listID}
                 hasCreatedActionAdded={shouldAddCreatedAction}
-                isConciergeSidePanel={isConciergeSidePanel}
                 showHiddenHistory={!showFullHistory}
                 hasPreviousMessages={hasPreviousMessages}
                 onShowPreviousMessages={handleShowPreviousMessages}
diff --git a/src/pages/inbox/report/ShowPreviousMessagesButton.tsx b/src/pages/inbox/report/ShowPreviousMessagesButton.tsx
new file mode 100644
index 000000000000..72b48853e907
--- /dev/null
+++ b/src/pages/inbox/report/ShowPreviousMessagesButton.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import useIsInSidePanel from '@hooks/useIsInSidePanel';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {ReportAction} from '@src/types/onyx';
+
+type ShowPreviousMessagesButtonProps = {
+    /** The ID of the report this list item belongs to */
+    reportID: string;
+
+    /** The action type of the report action being rendered for this list item */
+    actionType: ReportAction['actionName'];
+
+    /** Whether there are previous messages hidden before the session start */
+    hasPreviousMessages: boolean;
+
+    /** Whether the full message history is currently shown */
+    showFullHistory: boolean;
+
+    /** Callback to reveal the full message history */
+    onPress?: () => void;
+};
+
+function ShowPreviousMessagesButton({reportID, actionType, hasPreviousMessages, showFullHistory, onPress}: ShowPreviousMessagesButtonProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const expensifyIcons = useMemoizedLazyExpensifyIcons(['UpArrow']);
+    const isInSidePanel = useIsInSidePanel();
+    const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const isConciergeSidePanel = isInSidePanel && reportID === conciergeReportID;
+
+    if (!isConciergeSidePanel) {
+        return null;
+    }
+    if (!onPress) {
+        return null;
+    }
+    if (actionType !== CONST.REPORT.ACTIONS.TYPE.CREATED) {
+        return null;
+    }
+    if (!hasPreviousMessages) {
+        return null;
+    }
+    if (showFullHistory) {
+        return null;
+    }
+
+    return (
+        <View style={[styles.flexRow, styles.alignItemsCenter, styles.pv3, styles.mh5]}>
+            <View style={[styles.threadDividerLine, styles.ml0, styles.mr0, styles.flexGrow1]} />
+            <View>
+                <Button
+                    small
+                    shouldShowRightIcon
+                    iconRight={expensifyIcons.UpArrow}
+                    text={translate('common.concierge.showHistory')}
+                    onPress={onPress}
+                />
+            </View>
+            <View style={[styles.threadDividerLine, styles.ml0, styles.mr0, styles.flexGrow1]} />
+        </View>
+    );
+}
+
+export default ShowPreviousMessagesButton;
diff --git a/tests/unit/ReportActionsListHeaderTest.tsx b/tests/unit/ReportActionsListHeaderTest.tsx
new file mode 100644
index 000000000000..61f6fb2f449f
--- /dev/null
+++ b/tests/unit/ReportActionsListHeaderTest.tsx
@@ -0,0 +1,65 @@
+import {render, screen} from '@testing-library/react-native';
+import React from 'react';
+import ReportActionsListHeader from '@pages/inbox/report/ReportActionsListHeader';
+
+const REPORT_ID = '42';
+
+const mockUseOnyx = jest.fn<unknown[], [string]>();
+
+jest.mock('@hooks/useOnyx', () => ({
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    __esModule: true,
+    default: (key: string) => mockUseOnyx(key),
+}));
+
+jest.mock('@pages/home/report/ConciergeThinkingMessage', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View: MockView} = require('react-native');
+    return {
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        __esModule: true,
+        default: () => <MockView testID="ConciergeThinkingMessage" />,
+    };
+});
+
+jest.mock('@pages/inbox/report/ListBoundaryLoader', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View: MockView} = require('react-native');
+    return {
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        __esModule: true,
+        default: () => <MockView testID="ListBoundaryLoader" />,
+    };
+});
+
+describe('ReportActionsListHeader', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockUseOnyx.mockImplementation((key: string) => {
+            if (key.startsWith('report_')) {
+                return [{reportID: REPORT_ID}];
+            }
+            return [undefined];
+        });
+    });
+
+    it('renders ListBoundaryLoader', () => {
+        render(
+            <ReportActionsListHeader
+                reportID={REPORT_ID}
+                onRetry={jest.fn()}
+            />,
+        );
+        expect(screen.getByTestId('ListBoundaryLoader')).toBeTruthy();
+    });
+
+    it('renders ConciergeThinkingMessage and delegates visibility gating to that component', () => {
+        render(
+            <ReportActionsListHeader
+                reportID={REPORT_ID}
+                onRetry={jest.fn()}
+            />,
+        );
+        expect(screen.getByTestId('ConciergeThinkingMessage')).toBeTruthy();
+    });
+});
diff --git a/tests/unit/ShowPreviousMessagesButtonTest.tsx b/tests/unit/ShowPreviousMessagesButtonTest.tsx
new file mode 100644
index 000000000000..8dc9e2ab0431
--- /dev/null
+++ b/tests/unit/ShowPreviousMessagesButtonTest.tsx
@@ -0,0 +1,93 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+import {IsInSidePanelContext} from '@hooks/useIsInSidePanel';
+import ShowPreviousMessagesButton from '@pages/inbox/report/ShowPreviousMessagesButton';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+jest.mock('@hooks/useLazyAsset', () => ({
+    useMemoizedLazyExpensifyIcons: () => ({UpArrow: 'UpArrow'}),
+}));
+
+const CONCIERGE_REPORT_ID = '1';
+
+const renderButton = (overrides: Partial<React.ComponentProps<typeof ShowPreviousMessagesButton>> = {}, contextOverrides: {isInSidePanel?: boolean} = {}) => {
+    const props = {
+        reportID: CONCIERGE_REPORT_ID,
+        actionType: CONST.REPORT.ACTIONS.TYPE.CREATED,
+        hasPreviousMessages: true,
+        showFullHistory: false,
+        onPress: jest.fn(),
+        ...overrides,
+    };
+    const isInSidePanel = contextOverrides.isInSidePanel ?? true;
+    render(
+        <OnyxListItemProvider>
+            <IsInSidePanelContext.Provider value={isInSidePanel}>
+                <ShowPreviousMessagesButton
+                    reportID={props.reportID}
+                    actionType={props.actionType}
+                    hasPreviousMessages={props.hasPreviousMessages}
+                    showFullHistory={props.showFullHistory}
+                    onPress={props.onPress}
+                />
+            </IsInSidePanelContext.Provider>
+        </OnyxListItemProvider>,
+    );
+    return props;
+};
+
+describe('ShowPreviousMessagesButton', () => {
+    beforeAll(async () => {
+        await Onyx.set(ONYXKEYS.CONCIERGE_REPORT_ID, CONCIERGE_REPORT_ID);
+        await waitForBatchedUpdates();
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('renders the button when all gates pass', () => {
+        renderButton();
+        expect(screen.getByRole('button')).toBeTruthy();
+    });
+
+    it('fires onPress when tapped', () => {
+        const {onPress} = renderButton();
+        fireEvent.press(screen.getByRole('button'));
+        expect(onPress).toHaveBeenCalledTimes(1);
+    });
+
+    it('renders nothing when not in the side panel', () => {
+        renderButton({}, {isInSidePanel: false});
+        expect(screen.queryByRole('button')).toBeNull();
+    });
+
+    it('renders nothing when reportID does not match the Concierge report', () => {
+        renderButton({reportID: '999'});
+        expect(screen.queryByRole('button')).toBeNull();
+    });
+
+    it('renders nothing when onPress is not provided', () => {
+        renderButton({onPress: undefined});
+        expect(screen.queryByRole('button')).toBeNull();
+    });
+
+    it('renders nothing when the action type is not CREATED', () => {
+        renderButton({actionType: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT});
+        expect(screen.queryByRole('button')).toBeNull();
+    });
+
+    it('renders nothing when hasPreviousMessages is false', () => {
+        renderButton({hasPreviousMessages: false});
+        expect(screen.queryByRole('button')).toBeNull();
+    });
+
+    it('renders nothing when showFullHistory is true', () => {
+        renderButton({showFullHistory: true});
+        expect(screen.queryByRole('button')).toBeNull();
+    });
+});