diff --git a/opentech/apply/funds/models.py b/opentech/apply/funds/models.py
index c28e3bc968be33f46abc05334765a57afd6023a9..d2215cb89e2ab1e5da3188efee7c99d6b5e1488f 100644
--- a/opentech/apply/funds/models.py
+++ b/opentech/apply/funds/models.py
@@ -648,11 +648,17 @@ class ApplicationSubmission(WorkflowHelpers, BaseStreamForm, AbstractFormSubmiss
             submission_in_db.next = self
             submission_in_db.save()
 
+    @property
     def missing_staff_reviews(self):
         return self.reviewers.staff().exclude(id__in=self.reviews.values('author'))
 
+    @property
     def missing_reviewer_reviews(self):
-        return self.reviewers.reviewers().exclude(id__in=self.reviews.values('author'))
+        return self.reviewers.reviewers().exclude(
+            id__in=self.reviews.values('author')
+        ).exclude(
+            id__in=self.missing_staff_reviews,
+        )
 
     def data_and_fields(self):
         for stream_value in self.form_fields:
diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py
index c124c230d602a59a92da32bf598b1ea9ca7a77c3..d0cacced66f56a56130eb110b2aef954e4b7ab4f 100644
--- a/opentech/apply/review/views.py
+++ b/opentech/apply/review/views.py
@@ -10,7 +10,7 @@ from .models import Review
 class ReviewContextMixin:
     def get_context_data(self, **kwargs):
         staff_reviews = self.object.reviews.by_staff()
-        reviewer_reviews = self.object.reviews.by_reviewers()
+        reviewer_reviews = self.object.reviews.by_reviewers().exclude(id__in=staff_reviews)
         return super().get_context_data(
             staff_reviews=staff_reviews,
             reviewer_reviews=reviewer_reviews,