diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index f1441c9216..c21bfca869 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -818,7 +818,7 @@ var tower = angular.module('Tower', [
                     console.log(toState.name);
                 }
                 else if(toState.name === 'adHocJobStdout'){
-                    SocketService.emit(`{"groups":{"ad_hoc_command_events": [${toParams.id}]}}`);
+                    SocketService.emit(`{"groups":{"jobs": ["status_changed"] , "ad_hoc_command_events": [${toParams.id}]}}`);
                     console.log(toState.name);
                 }
             });
diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js
index ca7ddb2aee..eadadfc83d 100644
--- a/awx/ui/client/src/shared/socket/socket.service.js
+++ b/awx/ui/client/src/shared/socket/socket.service.js
@@ -78,7 +78,7 @@ export default
                             $rootScope.$emit('ScheduleStatusChange', data);
                         }
                         if(data.group_name==="ad_hoc_command_events"){
-
+                            $rootScope.$emit('ad_hoc_command_events-'+data.ad_hoc_command, data);
                         }
                         if(data.group_name==="control"){
                             $log.debug(data.reason);
diff --git a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js
index f878ef02f8..0df5cd54af 100644
--- a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js
+++ b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js
@@ -17,19 +17,5 @@ export default {
     },
     data: {
         jobType: 'ad_hoc_commands'
-    },
-    resolve: {
-        adhocEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
-            if (!$rootScope.adhoc_event_socket) {
-                $rootScope.adhoc_event_socket = Socket({
-                    scope: $rootScope,
-                    endpoint: "ad_hoc_command_events"
-                });
-                $rootScope.adhoc_event_socket.init();
-                return true;
-            } else {
-                return true;
-            }
-        }]
     }
 };
diff --git a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js
index 5f05f9e4fc..74dfede3a0 100644
--- a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js
+++ b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js
@@ -36,7 +36,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
             }
             if ($state.current.name === 'adHocJobStdout') {
                 $log.debug("socket watching on ad_hoc_command_events-" + job_id);
-                $rootScope.adhoc_event_socket.on("ad_hoc_command_events-" + job_id, function() {
+                $rootScope.$on("ad_hoc_command_events-" + job_id, function() {
                     $log.debug("socket fired on ad_hoc_command_events-" + job_id);
                     if (api_complete) {
                         event_queue++;