diff --git a/awx/main/signals.py b/awx/main/signals.py
index cd789a7604..8014603949 100644
--- a/awx/main/signals.py
+++ b/awx/main/signals.py
@@ -105,11 +105,10 @@ def emit_job_event_detail(sender, **kwargs):
                                 event_data=instance.event_data,
                                 failed=instance.failed,
                                 changed=instance.changed,
-                                host=instance.host,
+                                host=instance.host.id,
                                 play=instance.play,
                                 role=instance.role,
-                                task=instance.task,
-                                parent=instance.parent.id)
+                                task=instance.task)
         emit_websocket_notification('/socket.io/job_events', 'job_events-' + str(instance.id), event_serialized)
 
 post_save.connect(update_inventory_computed_fields, sender=Host)
diff --git a/awx/ui/static/js/controllers/Sockets.js b/awx/ui/static/js/controllers/Sockets.js
index 1a203a347f..558defae2c 100644
--- a/awx/ui/static/js/controllers/Sockets.js
+++ b/awx/ui/static/js/controllers/Sockets.js
@@ -38,7 +38,7 @@ function SocketsController ($scope, $compile, ClearScope, Socket) {
     e = angular.element(document.getElementById('jobs-container'));
     e.append(html);
     $compile(e)(jobs_scope);
-    
+
     html = "<div class=\"alert alert-info\"><strong>Socket url</strong>: {{ socket_url }} &nbsp;<strong>Status:</strong> {{ socket_status }} {{ socket_reason }}</div>\n" +
             "<form class=\"form-inline\">\n" +
                 "<div class=\"form-group\">\n" +
@@ -78,7 +78,7 @@ function SocketsController ($scope, $compile, ClearScope, Socket) {
     job_events_scope.subscribeToJobEvent = function() {
         job_events_scope.jobs_list.push(job_events_scope.job_id);
         job_events_socket.on("job_events-" + job_events_scope.job_id, function(data) {
-            jobs_scope.messages.push(data);
+            job_events_scope.messages.push(data);
         });
     };
 }