diff --git a/awx/ui/static/js/app.js b/awx/ui/static/js/app.js
index 6e49defdcf..dff0feb89d 100644
--- a/awx/ui/static/js/app.js
+++ b/awx/ui/static/js/app.js
@@ -470,6 +470,10 @@ angular.module('Tower', [
                     HideStream();
                 }
 
+                if ($rootScope.jobDetailInterval) {
+                    window.clearInterval($rootScope.jobDetailInterval);
+                }
+
                 // On each navigation request, check that the user is logged in
                 if (!/^\/(login|logout)/.test($location.path())) {
                     // capture most recent URL, excluding login/logout
diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js
index e8d5ee65ce..ab4db9edde 100644
--- a/awx/ui/static/js/controllers/JobDetail.js
+++ b/awx/ui/static/js/controllers/JobDetail.js
@@ -45,6 +45,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
     scope.searchSummaryHostsEnabled = true;
     scope.searchAllHostsEnabled = true;
     scope.haltEventQueue = false;
+    scope.processing = false;
 
     scope.host_summary = {};
     scope.host_summary.ok = 0;
@@ -69,13 +70,14 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
     event_socket.on("job_events-" + job_id, function(data) {
         data.event = data.event_name;
         if (api_complete && data.id > lastEventId) {
-            if (queue.length < 20) {
+            if (queue.length < 25) {
+                $log.debug('received event: ' + data.id);
                 queue.unshift(data);
             }
             else {
                 api_complete = false;  // stop more events from hitting the queue
                 window.clearInterval($rootScope.jobDetailInterval);
-                $log.debug('queue halted. reloading...');
+                $log.debug('halting queue. reloading...');
                 setTimeout(function() {
                     $log.debug('reload');
                     scope.haltEventQueue = true;
@@ -99,6 +101,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
                 $log.debug('Job completed!');
                 api_complete = false;
                 scope.haltEventQueue = true;
+                window.clearInterval($rootScope.jobDetailInterval);
                 queue = [];
                 scope.$emit('LoadJob');
             }
@@ -124,7 +127,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
         playId = (scope.plays.length > 0) ? scope.plays[scope.plays.length - 1].id : 0;
         lastEventId = Math.max(hostId, taskId, playId);
 
-        api_complete = true;
         Wait('stop');
 
         // Draw the graph
@@ -147,16 +149,18 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
                         msg: 'Call to ' + url + '. GET returned: ' + status });
                 });
         }
-        else if (scope.host_summary.total > 0) {
-            // Draw the graph based on summary values in memory
-            DrawGraph({ scope: scope, resize: true });
+        else {
+            if (scope.host_summary.total > 0) {
+                // Draw the graph based on summary values in memory
+                DrawGraph({ scope: scope, resize: true });
+            }
+            api_complete = true;
+            scope.haltEventQueue = false;
+            ProcessEventQueue({
+                scope: scope,
+                eventQueue: queue
+            });
         }
-
-        ProcessEventQueue({
-            scope: scope,
-            eventQueue: queue
-        });
-
     });
 
     if (scope.removeInitialDataLoaded) {
diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js
index 3ea3c3358d..8cca5f77d4 100644
--- a/awx/ui/static/js/helpers/JobDetail.js
+++ b/awx/ui/static/js/helpers/JobDetail.js
@@ -42,25 +42,21 @@ angular.module('JobDetailHelper', ['Utilities', 'RestServices'])
 .factory('ProcessEventQueue', ['$log', '$rootScope', 'DigestEvent', 'JobIsFinished', function ($log, $rootScope, DigestEvent, JobIsFinished) {
     return function(params) {
         var scope = params.scope,
-            eventQueue = params.eventQueue,
-            processing = false;
+            eventQueue = params.eventQueue;
         function runTheQ() {
             var event;
-            processing = true;
+            scope.processing = true;
             while (!JobIsFinished(scope) && !scope.haltEventQueue && eventQueue.length > 0) {
                 event = eventQueue.pop();
                 $log.debug('processing event: ' + event.id);
                 DigestEvent({ scope: scope, event: event });
             }
-            processing = false;
-            //if (!JobIsFinished(scope) && !scope.haltEventQueue) {
-            //    setTimeout( function() {
-            //        runTheQ();
-            //    }, 1000);
-            //}
+            $log.debug('processing halted');
+            scope.processing = false;
         }
         $rootScope.jobDetailInterval = window.setInterval(function() {
-            if (!processing && eventQueue.length > 0) {
+            $log.debug('checking... processing: ' + scope.processing + ' queue.length: ' + eventQueue.length);
+            if (!scope.processing && eventQueue.length > 0) {
                 runTheQ();
             }
         }, 1000);