diff --git a/packages/component-manuscript/src/components/ReviewReportCard.js b/packages/component-manuscript/src/components/ReviewReportCard.js
index efab0b1bda984f48c77c38735db266dae66b90ff..e306ed05dc681d454024cb2eda839ca0bfc0f734 100644
--- a/packages/component-manuscript/src/components/ReviewReportCard.js
+++ b/packages/component-manuscript/src/components/ReviewReportCard.js
@@ -10,12 +10,12 @@ import { FileItem } from 'pubsweet-components-faraday/src/components/Files'
 import ShowMore from './ShowMore'
 
 const ReviewReportCard = ({
+  i = 0,
   report = {},
   journal: { recommendations },
-  i = 0,
 }) => {
   const hasReviewer = !isEmpty(get(report, 'user'))
-  const { submittedOn, comments, user } = report
+  const { submittedOn, comments = [], user } = report
   const submittedDate = moment(submittedOn).format('DD.MM.YYYY')
   const publicComment = comments.find(c => c.public)
   const privateComment = comments.find(c => !c.public)
diff --git a/packages/component-manuscript/src/components/ReviewsAndReports.js b/packages/component-manuscript/src/components/ReviewsAndReports.js
index 5c447fc5797077bfb07c80eadad7de111198f7da..2a5b22aafb647aac32ed6824a3ea0a75f1ee55c5 100644
--- a/packages/component-manuscript/src/components/ReviewsAndReports.js
+++ b/packages/component-manuscript/src/components/ReviewsAndReports.js
@@ -47,12 +47,12 @@ const getTabSections = (collectionId, reviewers, recommendations = []) => [
 const ReviewsAndReports = ({
   project,
   version,
-  reviewers = [],
-  recommendations = [],
-  isReviewer,
-  currentUserIs,
   report,
+  isReviewer,
   review = {},
+  currentUserIs,
+  reviewers = [],
+  recommendations = [],
   mappedRecommendations,
 }) => (
   <Fragment>