diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index 51a4ba39ca..2f4a3e2575 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -810,7 +810,6 @@ function OutputIndexController (
             onStop () {
                 lockFollow = true;
                 stopFollowing();
-                stopListening();
                 status.updateStats();
                 status.dispatch();
                 status.sync();
diff --git a/awx/ui/client/features/output/status.service.js b/awx/ui/client/features/output/status.service.js
index 8b3e995efd..356b9cbe1c 100644
--- a/awx/ui/client/features/output/status.service.js
+++ b/awx/ui/client/features/output/status.service.js
@@ -95,6 +95,9 @@ function JobStatusService (moment, message) {
 
         if (isJobStatusEvent) {
             this.setJobStatus(data.status);
+            if (JOB_STATUS_FINISHED.includes(data.status)) {
+                this.sync();
+            }
             this.dispatch();
         } else if (isProjectStatusEvent) {
             this.setProjectStatus(data.status);