diff --git a/src/libs/isReportMessageAttachment.js b/src/libs/isReportMessageAttachment.js
index e524d5f79f64..e3553df5e1de 100644
--- a/src/libs/isReportMessageAttachment.js
+++ b/src/libs/isReportMessageAttachment.js
@@ -8,5 +8,6 @@ import CONST from '../CONST';
  * @returns {Boolean}
  */
 export default function isReportMessageAttachment({text, html}) {
-    return text === CONST.ATTACHMENT_MESSAGE_TEXT && html !== CONST.ATTACHMENT_MESSAGE_TEXT;
+    const regex = new RegExp(` ${CONST.ATTACHMENT_SOURCE_ATTRIBUTE}="(.*)"`, 'i');
+    return text === CONST.ATTACHMENT_MESSAGE_TEXT && !!html.match(regex);
 }
diff --git a/tests/unit/isReportMessageAttachmentTest.js b/tests/unit/isReportMessageAttachmentTest.js
new file mode 100644
index 000000000000..8338513a7e7e
--- /dev/null
+++ b/tests/unit/isReportMessageAttachmentTest.js
@@ -0,0 +1,22 @@
+import isReportMessageAttachment from '../../src/libs/isReportMessageAttachment';
+
+describe('isReportMessageAttachment', () => {
+    it('returns true if a report action is attachment', () => {
+        const message = {
+            text: '[Attachment]',
+            html: '<img src="https://www.expensify.com/chat-attachments/1260926113061804740/w_66791ca35b3c34c2a0eda4d065d97c9907cadd61.jpg.1024.jpg" data-expensify-source="https://www.expensify.com/chat-attachments/1260926113061804740/w_66791ca35b3c34c2a0eda4d065d97c9907cadd61.jpg" data-name="rn_image_picker_lib_temp_636b71a8-18fd-41a1-9725-6587ffb207a7.jpg" data-expensify-width="4000" data-expensify-height="3000" />',
+        };
+        expect(isReportMessageAttachment(message)).toBe(true);
+    });
+
+    it('returns false if a report action is not attachment', () => {
+        let message = {text: '[Attachment]', html: '<em>[Attachment]</em>'};
+        expect(isReportMessageAttachment(message)).toBe(false);
+
+        message = {text: '[Attachment]', html: '<a href="https://www.google.com" target="_blank" rel="noreferrer noopener">[Attachment]</a>'};
+        expect(isReportMessageAttachment(message)).toBe(false);
+
+        message = {text: '[Attachment]', html: '<a href="https://www.google.com/?data-expensify-source=" target="_blank" rel="noreferrer noopener">[Attachment]</a>'};
+        expect(isReportMessageAttachment(message)).toBe(false);
+    });
+});