diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py
index 7395d416a..429202571 100644
--- a/src/apps/pages/views.py
+++ b/src/apps/pages/views.py
@@ -69,6 +69,12 @@ def get_context_data(self, *args, **kwargs):
 
         context = super().get_context_data(*args, **kwargs)
         context['submissions'] = qs[:250]
+
+        for submission in context['submissions']:
+            # Get queue from each submission's competition
+            queue_name = "*" if submission.phase.competition.queue is None else submission.phase.competition.queue.name
+            submission.competition_queue = queue_name
+
         return context
 
 
diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html
index 2a775edf6..c8b2398e5 100644
--- a/src/templates/pages/server_status.html
+++ b/src/templates/pages/server_status.html
@@ -12,6 +12,7 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
             <th>Competition</th>
             <th>Submission PK</th>
             <th>Submitter</th>
+            <th>Queue</th>
             <th>Hostname</th>
             <th>Submitted at</th>
             <th>Status</th>
@@ -27,6 +28,7 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
                     <td><a class="link-no-deco" target="_blank" href="./competitions/{{ submission.phase.competition.id }}">{{ submission.phase.competition.title }}</a></td>
                     <td>{{ submission.pk }}</td>
                     <td><a target="_blank" href="/profiles/user/{{ submission.owner.username }}">{{ submission.owner.username }}</a></td>
+                    <td>{{ submission.competition_queue }}</td>
                     <td>{{ submission.worker_hostname }}</td>
                     <td>{{ submission.created_when|timesince }} ago</td>
                     <td>{{ submission.status }}</td>