diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index cbd8728f420b..5b170c837eee 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -905,7 +905,7 @@ function MoneyReportHeader({
)}
{shouldShowNextStep && !!optimisticNextStep?.message?.length && }
- {shouldShowNextStep && !optimisticNextStep?.message?.length && !!isLoadingInitialReportActions && }
+ {shouldShowNextStep && !optimisticNextStep?.message?.length && !!isLoadingInitialReportActions && !isOffline && }
{!!statusBarProps && (
{
- if (reportMetadata.isOptimisticReport) {
+ if (reportMetadata.isOptimisticReport && report?.type === CONST.REPORT.TYPE.CHAT) {
return;
}
@@ -482,13 +482,14 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
openReport(reportIDFromRoute, reportActionIDFromRoute);
}, [
reportMetadata.isOptimisticReport,
+ report?.type,
+ report?.errorFields?.notFound,
+ isOffline,
route.params?.moneyRequestReportActionID,
route.params?.transactionID,
+ currentUserEmail,
reportIDFromRoute,
reportActionIDFromRoute,
- currentUserEmail,
- report?.errorFields?.notFound,
- isOffline,
]);
useEffect(() => {