diff --git a/packages/component-faraday-selectors/src/index.js b/packages/component-faraday-selectors/src/index.js
index 3a774ca94dbc52c0786a550c3dc096001946b53e..709e7506f0b75893b0cbbfb9882cce5f5c992734 100644
--- a/packages/component-faraday-selectors/src/index.js
+++ b/packages/component-faraday-selectors/src/index.js
@@ -121,13 +121,13 @@ export const reviewersCanViewReviewerReports = (
   fragmentId,
 ) => {
   const isReviewer = currentUserIsReviewer(state, fragmentId)
-  const reviewerReports = getFragmentReviewerRecommendations(state, fragmentId)
+  const ownRecommendation = getOwnRecommendations(state, fragmentId)
   return (
     isReviewer &&
     authorAndReviewersCanViewReportsDetailsStatuses.includes(
       get(collection, 'status', 'draft'),
     ) &&
-    reviewerReports.length > 0
+    get(ownRecommendation[0], 'submittedOn', false)
   )
 }
 
@@ -554,6 +554,6 @@ export const canReview = (state, collection = {}, fragment = {}) => {
   if (!isReviewer) return false
   return (
     get(collection, 'status', 'draft') === 'underReview' &&
-    ownRecommendation.length === 0
+    !get(ownRecommendation[0], 'submittedOn', false)
   )
 }