diff --git a/packages/component-faraday-selectors/src/index.js b/packages/component-faraday-selectors/src/index.js
index 709e7506f0b75893b0cbbfb9882cce5f5c992734..3c48b4f1aaf15ce372a53952f776dd1049bb49bb 100644
--- a/packages/component-faraday-selectors/src/index.js
+++ b/packages/component-faraday-selectors/src/index.js
@@ -557,3 +557,6 @@ export const canReview = (state, collection = {}, fragment = {}) => {
     !get(ownRecommendation[0], 'submittedOn', false)
   )
 }
+
+export const isFetchingFromAutosave = state =>
+  get(state.autosave, 'isFetching', false)
diff --git a/packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js b/packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js
index 27a9917dc42060ebe0e8784d19ad17d87ba56444..8d66da2f9edae85b6e2cb7236b5883f23136d0ce 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js
@@ -35,6 +35,7 @@ const ReviewerReportForm = ({
   review = {},
   formValues = {},
   journal: { recommendations },
+  isFetchingFromAutosave,
 }) => (
   <ContextualBox
     expanded={expanded}
@@ -148,7 +149,7 @@ const ReviewerReportForm = ({
         </Row>
       )}
       <Row justify="flex-end" mt={1}>
-        {isFetching ? (
+        {isFetching || isFetchingFromAutosave ? (
           <Spinner />
         ) : (
           <Button
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 868b408304a4537d0d39affe98fabaeb3e0c3ff5..589bf76083c0852480e0d3bde0e3a62ed13bfbf9 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -58,6 +58,7 @@ const ManuscriptLayout = ({
   heResponseExpanded,
   inviteHandlingEditor,
   toggleReviewerDetails,
+  isFetchingFromAutosave,
   recommendationHandler,
   toggleReviewerResponse,
   reviewerDetailsExpanded,
@@ -163,6 +164,7 @@ const ManuscriptLayout = ({
               changeForm={changeForm}
               expanded={reviewerRecommendationExpanded}
               formValues={get(formValues, 'reviewerReport', {})}
+              isFetchingFromAutosave={isFetchingFromAutosave}
               modalKey="reviewer-report"
               project={collection}
               review={pendingOwnRecommendation}
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index 9ecbb8297bdce18ebcfd1b00c0b26e2b624af545..928d9077cc3d789097545716b34e5431ce9d0b14 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -46,6 +46,7 @@ import {
   pendingHEInvitation,
   currentUserIsReviewer,
   parseCollectionDetails,
+  isFetchingFromAutosave,
   canMakeHERecommendation,
   canViewReviewersDetails,
   canViewEditorialComments,
@@ -227,6 +228,7 @@ export default compose(
         editorsFetching: selectFetching(state),
         publonsFetching: isFetching,
       },
+      isFetchingFromAutosave: isFetchingFromAutosave(state),
       formValues: {
         revision: getFormValues('revision')(state),
         eicDecision: getFormValues('eic-decision')(state),