diff --git a/commentaries/views.py b/commentaries/views.py
index 640100a7c22436864ce3aab1e7b49e76f10a0c67..e103063d5ff6074d4a37aa0137a51efb166697cd 100644
--- a/commentaries/views.py
+++ b/commentaries/views.py
@@ -282,7 +282,9 @@ class CommentaryListView(ListView):
         context = super().get_context_data(**kwargs)
 
         # Get newest comments
-        context['comment_list'] = Comment.objects.vetted().order_by('-date_submitted')[:10]
+        context['comment_list'] = Comment.objects.vetted().select_related(
+                                  'author__user', 'submission', 'commentary').order_by(
+                                  '-date_submitted')[:10]
 
         # Form into the context!
         context['form'] = self.form