diff --git a/ui/app/models/node-event.js b/ui/app/models/node-event.js
index 2e6ee30d5..8fcf3cfad 100644
--- a/ui/app/models/node-event.js
+++ b/ui/app/models/node-event.js
@@ -1,3 +1,4 @@
+import { alias } from '@ember/object/computed';
 import Fragment from 'ember-data-model-fragments/fragment';
 import attr from 'ember-data/attr';
 import { fragmentOwner } from 'ember-data-model-fragments/attributes';
@@ -9,4 +10,6 @@ export default Fragment.extend({
   subsystem: attr('string'),
   details: attr(),
   time: attr('date'),
+
+  driver: alias('details.driver'),
 });
diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs
index 421dd6447..f5ad36c9f 100644
--- a/ui/app/templates/clients/client.hbs
+++ b/ui/app/templates/clients/client.hbs
@@ -110,6 +110,9 @@
               <td data-test-client-event-subsystem>{{row.model.subsystem}}</td>
               <td data-test-client-event-message>
                 {{#if row.model.message}}
+                  {{#if row.model.driver}}
+                    <span class="badge is-secondary is-small">{{row.model.driver}}</span>
+                  {{/if}}
                   {{row.model.message}}
                 {{else}}
                   <em>No message</em>