diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js
index c7ea8c4edf..1547003a31 100644
--- a/awx/ui/static/js/controllers/JobDetail.js
+++ b/awx/ui/static/js/controllers/JobDetail.js
@@ -186,11 +186,9 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
     }
     scope.removePlaysReady = scope.$on('PlaysReady', function() {
         // Select the most recent play, which will trigger tasks and hosts to load
-        var ids = Object.keys(scope.plays),
-            lastPlay = (ids.length > 0) ? ids[ids.length - 1] : null;
         SelectPlay({
             scope: scope,
-            id: lastPlay,
+            id: ((scope.plays.length > 0) ? scope.plays[scope.plays.length - 1].id : null ),
             callback: 'InitialDataLoaded'
         });
     });
diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js
index 6ef45433c7..5691cef2f7 100644
--- a/awx/ui/static/js/helpers/JobDetail.js
+++ b/awx/ui/static/js/helpers/JobDetail.js
@@ -61,8 +61,8 @@ angular.module('JobDetailHelper', ['Utilities', 'RestServices'])
 }])
 
 .factory('DigestEvent', ['$rootScope', '$log', 'UpdatePlayStatus', 'UpdateHostStatus', 'AddHostResult', 'SelectPlay', 'SelectTask',
-    'GetHostCount', 'GetElapsed', 'UpdateTaskStatus', 'DrawGraph', 'LoadHostSummary', 'JobIsFinished', 'AddNewTask',
-function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, SelectPlay, SelectTask, GetHostCount, GetElapsed,
+    'GetElapsed', 'UpdateTaskStatus', 'DrawGraph', 'LoadHostSummary', 'JobIsFinished', 'AddNewTask',
+function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, SelectPlay, SelectTask, GetElapsed,
     UpdateTaskStatus, DrawGraph, LoadHostSummary, JobIsFinished, AddNewTask) {
     return function(params) {
 
@@ -467,7 +467,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se
 }])
 
 // Add a new host result
-.factory('AddHostResult', ['FindFirstTaskofPlay', 'SetTaskStyles', function(FindFirstTaskofPlay, SetTaskStyles) {
+.factory('AddHostResult', ['SetTaskStyles', function(SetTaskStyles) {
     return function(params) {
         var scope = params.scope,
             task_id = params.task_id,