diff --git a/packages/component-faraday-ui/src/Tabs.js b/packages/component-faraday-ui/src/Tabs.js
index 76d0699c166690707ae38dc344f0cfa5f0833d44..a7d90025dcd5eb9ce1d48215b0da37319fe9dffa 100644
--- a/packages/component-faraday-ui/src/Tabs.js
+++ b/packages/component-faraday-ui/src/Tabs.js
@@ -4,12 +4,9 @@ const Tabs = ({ items, selectedTab, changeTab, children }) =>
   children({ selectedTab, changeTab })
 
 export default compose(
-  withStateHandlers(
-    { selectedTab: 0 },
-    {
-      changeTab: () => selectedTab => ({
-        selectedTab,
-      }),
-    },
-  ),
+  withStateHandlers(({ selectedTab = 0 }) => ({ selectedTab }), {
+    changeTab: () => selectedTab => ({
+      selectedTab,
+    }),
+  }),
 )(Tabs)
diff --git a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
index 48126901139102f39cc8bee06828e9647fd50b10..d64a8a58c009bf3d77b62b2f5e2367b371d389c9 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
@@ -21,7 +21,7 @@ import {
 
 const ReviewerDetails = ({
   journal,
-  reports,
+  reports = [],
   fragment,
   invitations,
   previewFile,
@@ -47,7 +47,7 @@ const ReviewerDetails = ({
       toggle={toggle}
       {...rest}
     >
-      <Tabs>
+      <Tabs selectedTab={reports.length ? 1 : 0}>
         {({ selectedTab, changeTab }) => (
           <Fragment>
             <TabsHeader>
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 2450088dfa1d23f29cd9070bd21735f3a1f5d440..fc006093cb6812da5384997a07d97dba965ed1f3 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -181,15 +181,17 @@ const ManuscriptLayout = ({
           />
         )}
 
-        {get(currentUser, 'permissions.canMakeHERecommendation', false) && (
-          <HERecommendation
-            formValues={get(formValues, 'editorialRecommendation', {})}
-            hasReviewerReports={reviewerRecommendations.length > 0}
-            highlight={reviewerRecommendations.length > 0}
-            modalKey="heRecommendation"
-            onRecommendationSubmit={onEditorialRecommendation}
-          />
-        )}
+        {get(currentUser, 'permissions.canMakeHERecommendation', false) &&
+          (!invitationsWithReviewers.length ||
+            reviewerRecommendations.length > 0) && (
+            <HERecommendation
+              formValues={get(formValues, 'editorialRecommendation', {})}
+              hasReviewerReports={reviewerRecommendations.length > 0}
+              highlight={reviewerRecommendations.length > 0}
+              modalKey="heRecommendation"
+              onRecommendationSubmit={onEditorialRecommendation}
+            />
+          )}
 
         {get(currentUser, 'permissions.canMakeDecision', false) && (
           <ManuscriptEicDecision