diff --git a/src/pages/FlagCommentPage.js b/src/pages/FlagCommentPage.js
index 8a637140abb9..568f6073a76e 100644
--- a/src/pages/FlagCommentPage.js
+++ b/src/pages/FlagCommentPage.js
@@ -116,7 +116,7 @@ function FlagCommentPage(props) {
         let reportID = getReportID(props.route);
 
         // Handle threads if needed
-        if (reportAction === undefined) {
+        if (reportAction === undefined || reportAction.reportActionID === undefined) {
             reportID = ReportUtils.getParentReport(props.report).reportID;
             reportAction = ReportActionsUtils.getParentReportAction(props.report);
         }