diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py
index 5e582033142576d963a68456d9a2c93b6bb4d2d9..e36a291feddd1fe8ecfd0246a46b5ccb49d0a311 100644
--- a/opentech/apply/funds/models/submissions.py
+++ b/opentech/apply/funds/models/submissions.py
@@ -7,7 +7,18 @@ from django.contrib.auth.models import Group
 from django.contrib.postgres.fields import JSONField
 from django.core.exceptions import PermissionDenied
 from django.db import models
-from django.db.models import Case, Count, IntegerField, OuterRef, Subquery, Sum, Q, Prefetch, When
+from django.db.models import (
+    Case,
+    Count,
+    IntegerField,
+    F,
+    OuterRef,
+    Prefetch,
+    Q,
+    Subquery,
+    Sum,
+    When,
+)
 from django.db.models.expressions import RawSQL, OrderBy
 from django.db.models.functions import Coalesce
 from django.dispatch import receiver
@@ -791,9 +802,9 @@ class AssignedReviewersQuerySet(models.QuerySet):
                 output_field=models.IntegerField(),
             )
         ).order_by(
-            'role__order',
+            F('role__order').asc(nulls_last=True),
             'type_order',
-            'review',
+            F('review__pk').asc(nulls_last=True),
         ).select_related(
             'reviewer',
             'role',
diff --git a/opentech/apply/funds/templates/funds/includes/review_sidebar.html b/opentech/apply/funds/templates/funds/includes/review_sidebar.html
index c812b7d9b54a62b7f319daab4f1bdbd20fcf1918..e3c5f1752d8e874d4416f7964bc23821fa8ad7fb 100644
--- a/opentech/apply/funds/templates/funds/includes/review_sidebar.html
+++ b/opentech/apply/funds/templates/funds/includes/review_sidebar.html
@@ -31,15 +31,4 @@
             {% endif %}
         {% endfor %}
     {% endfor %}
-
-    {% if reviews_block.external_reviewed or reviews_block.external_not_reviewed %}
-        {% for review_data in reviews_block.external_reviewed %}
-            {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer opinions=review_data.opinions %}
-        {% endfor %}
-
-        {% for review_data in reviews_block.external_not_reviewed %}
-            {% include 'funds/includes/review_sidebar_item.html' with reviewer=review_data.reviewer missing=True class="is-hidden" %}
-        {% endfor %}
-
-    {% endif %}
 </ul>
diff --git a/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html b/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html
index 3a6b8db9ed20a185ca19f18e19c9d549e295b5c5..955624c17038d68fbca3a8ae66cd45b6eb8c6565 100644
--- a/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html
+++ b/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html
@@ -1,7 +1,7 @@
 {% load wagtailimages_tags %}
 
 <li class="reviews-sidebar__item {% if hidden and  not reviewer.review %}is-hidden {% endif %}{% if not reviewer.review %}no-response {% endif %}">
-    {% if not reviewer.review %}
+    {% if not reviewer.review or reviewer.review.is_draft %}
         <div class="reviews-sidebar__name">
             <span>{{ reviewer}}</span>
             {% if reviewer.role %}{% image reviewer.role.icon max-12x12 %}{% endif %}