diff --git a/awx/ui/src/screens/Job/JobOutput/JobOutput.js b/awx/ui/src/screens/Job/JobOutput/JobOutput.js
index c6f68cf739..2bdfed6e58 100644
--- a/awx/ui/src/screens/Job/JobOutput/JobOutput.js
+++ b/awx/ui/src/screens/Job/JobOutput/JobOutput.js
@@ -240,7 +240,7 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
           setWsEvents([]);
           scrollToRow(lastScrollPosition);
         });
-      }, 250);
+      }, 500);
       return;
     }
     let batchTimeout;
@@ -278,7 +278,7 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
         batchedEvents = [];
       };
 
-      if (data.group_name === 'job_events') {
+      if (data.group_name === `${job.type}_events`) {
         batchedEvents.push(data);
         clearTimeout(batchTimeout);
         if (batchedEvents.length >= 25) {