diff --git a/awx/api/urls/job_event.py b/awx/api/urls/job_event.py
index 96f5146555..71a01af858 100644
--- a/awx/api/urls/job_event.py
+++ b/awx/api/urls/job_event.py
@@ -3,11 +3,10 @@
 
 from django.conf.urls import url
 
-from awx.api.views import JobEventList, JobEventDetail, JobEventChildrenList, JobEventHostsList
+from awx.api.views import JobEventDetail, JobEventChildrenList, JobEventHostsList
 
 
 urls = [
-    url(r'^$', JobEventList.as_view(), name='job_event_list'),
     url(r'^(?P<pk>[0-9]+)/$', JobEventDetail.as_view(), name='job_event_detail'),
     url(r'^(?P<pk>[0-9]+)/children/$', JobEventChildrenList.as_view(), name='job_event_children_list'),
     url(r'^(?P<pk>[0-9]+)/hosts/$', JobEventHostsList.as_view(), name='job_event_hosts_list'),
diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py
index 00f74c9e73..d9ccb9b36f 100644
--- a/awx/api/views/__init__.py
+++ b/awx/api/views/__init__.py
@@ -3738,13 +3738,6 @@ class JobHostSummaryDetail(RetrieveAPIView):
     serializer_class = serializers.JobHostSummarySerializer
 
 
-class JobEventList(NoTruncateMixin, ListAPIView):
-
-    model = models.JobEvent
-    serializer_class = serializers.JobEventSerializer
-    search_fields = ('stdout',)
-
-
 class JobEventDetail(RetrieveAPIView):
 
     model = models.JobEvent
@@ -3768,7 +3761,11 @@ class JobEventChildrenList(NoTruncateMixin, SubListAPIView):
     def get_queryset(self):
         parent_event = self.get_parent_object()
         self.check_parent_access(parent_event)
-        qs = self.request.user.get_queryset(self.model).filter(parent_uuid=parent_event.uuid)
+        qs = self.request.user.get_queryset(self.model).filter(
+            parent_uuid=parent_event.uuid
+        ).filter(
+            job_created=parent_event.job.created_or_epoch
+        )
         return qs
 
 
diff --git a/awx/api/views/root.py b/awx/api/views/root.py
index ac5592207f..e8530aab10 100644
--- a/awx/api/views/root.py
+++ b/awx/api/views/root.py
@@ -106,7 +106,6 @@ class ApiVersionRootView(APIView):
         data['hosts'] = reverse('api:host_list', request=request)
         data['job_templates'] = reverse('api:job_template_list', request=request)
         data['jobs'] = reverse('api:job_list', request=request)
-        data['job_events'] = reverse('api:job_event_list', request=request)
         data['ad_hoc_commands'] = reverse('api:ad_hoc_command_list', request=request)
         data['system_job_templates'] = reverse('api:system_job_template_list', request=request)
         data['system_jobs'] = reverse('api:system_job_list', request=request)