diff --git a/module/applications/dialogs/actionSelectionDialog.mjs b/module/applications/dialogs/actionSelectionDialog.mjs
index c421a577..6322ed63 100644
--- a/module/applications/dialogs/actionSelectionDialog.mjs
+++ b/module/applications/dialogs/actionSelectionDialog.mjs
@@ -57,7 +57,7 @@ export default class ActionSelectionDialog extends HandlebarsApplicationMixin(Ap
 
     /** @inheritDoc */
     async _prepareContext(options) {
-        const actions = this.#item.system.actionsList.map(action => ({
+        const actions = this.#item.system.actions.map(action => ({
                 ...action.toObject(),
                 id: action.id,
                 img: action.baseAction ? action.parent.parent.img : action.img
@@ -72,8 +72,8 @@ export default class ActionSelectionDialog extends HandlebarsApplicationMixin(Ap
 
     static async #onChooseAction(event, button) {
         const { actionId } = button.dataset;
-        this.#action = this.#item.system.actionsList.find(a => a._id === actionId);
-        Object.defineProperty(this.#event, 'shiftKey', {
+        this.action = this.item.system.actions.find(a => a._id === actionId);
+        Object.defineProperty(this.event, 'shiftKey', {
             get() {
                 return event.shiftKey;
             }
diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index 067aa473..f8924d6c 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -17,7 +17,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             this.action =
                 config.data.attack?._id == config.source.action
                     ? config.data.attack
-                    : this.item.system.actionsList?.find(a => a.id === config.source.action);
+                    : this.item.system.actions?.find(a => a.id === config.source.action);
         }
     }
 
diff --git a/module/data/action/attackAction.mjs b/module/data/action/attackAction.mjs
index f54ea282..15cc1696 100644
--- a/module/data/action/attackAction.mjs
+++ b/module/data/action/attackAction.mjs
@@ -51,7 +51,7 @@ export default class DHAttackAction extends DHDamageAction {
     async use(event, options) {
         const result = await super.use(event, options);
 
-        if (result?.message?.system.action.roll?.type === 'attack') {
+        if (result?.message?.system.action?.roll?.type === 'attack') {
             const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns;
             await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.characterAttack.id);
         }
diff --git a/module/data/chat-message/abilityUse.mjs b/module/data/chat-message/abilityUse.mjs
index f5986d0f..465461c0 100644
--- a/module/data/chat-message/abilityUse.mjs
+++ b/module/data/chat-message/abilityUse.mjs
@@ -25,7 +25,7 @@ export default class DHAbilityUse extends foundry.abstract.TypeDataModel {
         if (!actionActor || !this.source.item) return null;
 
         const item = actionActor.items.get(this.source.item);
-        return item ? item.system.actionsList?.find(a => a.id === this.source.action) : null;
+        return item ? item.system.actions?.find(a => a.id === this.source.action) : null;
     }
 
     get action() {
diff --git a/module/data/chat-message/actorRoll.mjs b/module/data/chat-message/actorRoll.mjs
index eaa1cdc2..02141c6b 100644
--- a/module/data/chat-message/actorRoll.mjs
+++ b/module/data/chat-message/actorRoll.mjs
@@ -84,7 +84,7 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
                 ];
             default:
                 const item = actionActor.items.get(this.source.item);
-                return item ? item.system.actionsList?.find(a => a.id === this.source.action) : null;
+                return item ? item.system.actions?.find(a => a.id === this.source.action) : null;
         }
     }