diff --git a/src/components/ReportActionItem/MoneyReportView.tsx b/src/components/ReportActionItem/MoneyReportView.tsx
index 740167292515..a4695ab51e0a 100644
--- a/src/components/ReportActionItem/MoneyReportView.tsx
+++ b/src/components/ReportActionItem/MoneyReportView.tsx
@@ -96,7 +96,7 @@ function MoneyReportView({report, policy, isCombinedReport = false, shouldShowTo
                                         errors={report.errorFields?.[fieldKey]}
                                         errorRowStyles={styles.ph5}
                                         key={`menuItem-${fieldKey}`}
-                                        onClose={() => reportActions.clearReportFieldErrors(report.reportID, reportField)}
+                                        onClose={() => reportActions.clearReportFieldKeyErrors(report.reportID, fieldKey)}
                                     >
                                         <MenuItemWithTopDescription
                                             description={Str.UCFirst(reportField.name)}
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 20a5de4b598e..18d62a94915d 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1838,8 +1838,7 @@ function updateReportName(reportID: string, value: string, previousValue: string
     API.write(WRITE_COMMANDS.SET_REPORT_NAME, parameters, {optimisticData, failureData, successData});
 }
 
-function clearReportFieldErrors(reportID: string, reportField: PolicyReportField) {
-    const fieldKey = ReportUtils.getReportFieldKey(reportField.fieldID);
+function clearReportFieldKeyErrors(reportID: string, fieldKey: string) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
         pendingFields: {
             [fieldKey]: null,
@@ -3887,7 +3886,7 @@ export {
     updateReportField,
     updateReportName,
     deleteReportField,
-    clearReportFieldErrors,
+    clearReportFieldKeyErrors,
     resolveActionableMentionWhisper,
     resolveActionableReportMentionWhisper,
     updateRoomVisibility,
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 978f37c525a7..6ade2009262e 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -633,11 +633,16 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
 
     const nameSectionTitleField = titleField && (
         <OfflineWithFeedback
-            pendingAction={report.pendingFields?.[fieldKey]}
-            errors={report.errorFields?.[fieldKey]}
+            pendingAction={report.pendingFields?.[fieldKey] ?? report.pendingFields?.reportName}
+            errors={report.errorFields?.[fieldKey] ?? report.errorFields?.reportName}
             errorRowStyles={styles.ph5}
             key={`menuItem-${fieldKey}`}
-            onClose={() => Report.clearReportFieldErrors(report.reportID, titleField)}
+            onClose={() => {
+                if (report.errorFields?.reportName) {
+                    Report.clearPolicyRoomNameErrors(report.reportID);
+                }
+                Report.clearReportFieldKeyErrors(report.reportID, fieldKey);
+            }}
         >
             <View style={[styles.flex1]}>
                 <MenuItemWithTopDescription