diff --git a/ui/app/machines/evaluations.js b/ui/app/machines/evaluations.js
index 4dced28c88f..eecaa85c844 100644
--- a/ui/app/machines/evaluations.js
+++ b/ui/app/machines/evaluations.js
@@ -8,6 +8,7 @@ import { assign, createMachine, send } from 'xstate';
 // Docs on using statecharts:  https://xstate.js.org/docs/packages/xstate-fsm/#api
 export default createMachine(
   {
+    predictableActionArguments: true,
     id: 'evaluations_ui',
     context: { evaluation: null },
     type: 'parallel',
diff --git a/ui/app/serializers/task-event.js b/ui/app/serializers/task-event.js
index 948bece481e..77bf355769a 100644
--- a/ui/app/serializers/task-event.js
+++ b/ui/app/serializers/task-event.js
@@ -8,9 +8,5 @@ import classic from 'ember-classic-decorator';
 
 @classic
 export default class TaskEventSerializer extends ApplicationSerializer {
-  attrs = {
-    message: 'DisplayMessage',
-  };
-
   separateNanos = ['Time'];
 }