diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index f2b6235476..5167eab0b5 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -72,12 +72,13 @@ function JobsIndexController (
 
 function init (pageMode) {
     page.init({
-        resource
+        resource,
     });
 
     render.init({
         get: () => resource.model.get(`related.${resource.related}.results`),
-        compile: html => $compile(html)($scope)
+        compile: html => $compile(html)($scope),
+        isStreamActive: stream.isActive
     });
 
     scroll.init({
diff --git a/awx/ui/client/features/output/render.service.js b/awx/ui/client/features/output/render.service.js
index d7b32ae408..e55f3901f1 100644
--- a/awx/ui/client/features/output/render.service.js
+++ b/awx/ui/client/features/output/render.service.js
@@ -22,11 +22,11 @@ const ansi = new Ansi();
 const entities = new Entities.AllHtmlEntities();
 
 function JobRenderService ($q, $sce, $window) {
-    this.init = ({ compile, apply, get }) => {
+    this.init = ({ compile, apply, isStreamActive }) => {
         this.parent = null;
         this.record = {};
         this.el = $(ELEMENT_TBODY);
-        this.hooks = { get, compile, apply };
+        this.hooks = { isStreamActive, compile, apply };
     };
 
     this.sortByLineNumber = (a, b) => {
@@ -155,7 +155,7 @@ function JobRenderService ($q, $sce, $window) {
         }
 
         if (current) {
-            if (current.isParent && current.line === ln) {
+            if (!this.hooks.isStreamActive() && current.isParent && current.line === ln) {
                 id = current.uuid;
                 tdToggle = `<td class="at-Stdout-toggle" ng-click="vm.toggle('${id}')"><i class="fa fa-angle-down can-toggle"></i></td>`;
             }
diff --git a/awx/ui/client/features/output/stream.service.js b/awx/ui/client/features/output/stream.service.js
index 65aa44ea43..d7f8a72555 100644
--- a/awx/ui/client/features/output/stream.service.js
+++ b/awx/ui/client/features/output/stream.service.js
@@ -110,7 +110,7 @@ function JobStreamService ($q) {
 
         this.chain = this.chain
             .then(() => {
-                if (data.event === JOB_START) {
+                if (!this.isActive()) {
                     this.start();
                 } else if (data.event === JOB_END) {
                     if (this.isPaused()) {