diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 9121eebb3367..3f8176a3f6f5 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -1,4 +1,5 @@
 /* eslint-disable no-continue */
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import Str from 'expensify-common/lib/str';
 // eslint-disable-next-line you-dont-need-lodash-underscore/get
 import lodashGet from 'lodash/get';
@@ -585,8 +586,13 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
     } else if (ReportActionUtils.isCreatedTaskReportAction(lastReportAction)) {
         lastMessageTextFromReport = TaskUtils.getTaskCreatedMessage(lastReportAction);
     }
-
-    return lastMessageTextFromReport || (report?.lastMessageText ?? '');
+    const parser = new ExpensiMark();
+    return (
+        lastMessageTextFromReport ||
+        (lastActionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT
+            ? ReportUtils.formatReportLastMessageText(parser.htmlToText(report?.lastMessageHtml ?? ''), false, true)
+            : report?.lastMessageText ?? '')
+    );
 }
 
 /**
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index ea0eba523092..92283e95aa81 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1377,10 +1377,16 @@ function canShowReportRecipientLocalTime(personalDetails: OnyxCollection<Persona
 /**
  * Shorten last message text to fixed length and trim spaces.
  */
-function formatReportLastMessageText(lastMessageText: string, isModifiedExpenseMessage = false): string {
+function formatReportLastMessageText(lastMessageText: string, isModifiedExpenseMessage = false, isAddComment = false): string {
     if (isModifiedExpenseMessage) {
         return String(lastMessageText).trim().replace(CONST.REGEX.LINE_BREAK, '').trim();
     }
+    if (isAddComment) {
+        return String(lastMessageText)
+            .trim()
+            .replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, ' '.repeat(CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH))
+            .substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH);
+    }
     return String(lastMessageText).trim().replace(CONST.REGEX.LINE_BREAK, ' ').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
 }
 
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index c363f49e7e3d..229da5756208 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -399,13 +399,12 @@ function addActions(reportID: string, text = '', file?: FileObject) {
     const lastAction = attachmentAction ?? reportCommentAction;
     const currentTime = DateUtils.getDBTimeWithSkew();
     const lastComment = lastAction?.message?.[0];
-    const lastCommentText = ReportUtils.formatReportLastMessageText(lastComment?.text ?? '');
 
     const optimisticReport: Partial<Report> = {
         lastVisibleActionCreated: currentTime,
         lastMessageTranslationKey: lastComment?.translationKey ?? '',
-        lastMessageText: lastCommentText,
-        lastMessageHtml: lastCommentText,
+        lastMessageText: text,
+        lastMessageHtml: text,
         lastActorAccountID: currentUserAccountID,
         lastReadTime: currentTime,
     };