diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py
index 44baa1020a..9abc909d1a 100644
--- a/awx/api/views/__init__.py
+++ b/awx/api/views/__init__.py
@@ -886,8 +886,8 @@ class ProjectUpdateEventsList(SubListAPIView):
     def get_queryset(self):
         job = self.get_parent_object()
         self.check_parent_access(job)
-        qs = job.job_events.select_related('host').filter(job_created=job.created).order_by('start_line')
-        return qs.all()
+        qs = super(ProjectUpdateEventsList, self).get_queryset()
+        return qs.filter(job_created=job.created).order_by('start_line').all()
 
 class SystemJobEventsList(SubListAPIView):
 
@@ -3825,7 +3825,7 @@ class JobJobEventsList(BaseJobEventsList):
     def get_queryset(self):
         job = self.get_parent_object()
         self.check_parent_access(job)
-        qs = job.job_events.select_related('host').filter(job_created=job.created).order_by('start_line')
+        qs = job.job_events.filter(job_created=job.created).select_related('host').order_by('start_line')
         return qs.all()
 
 
@@ -4008,7 +4008,7 @@ class BaseAdHocCommandEventsList(NoTruncateMixin, SubListAPIView):
     def get_queryset(self):
         job = self.get_parent_object()
         self.check_parent_access(job)
-        qs = job.job_events.select_related('host').filter(job_created=job.created).order_by('start_line')
+        qs = job.ad_hoc_command_events.select_related('host').filter(job_created=job.created).order_by('start_line')
         return qs.all()