diff --git a/module/data/actor/party.mjs b/module/data/actor/party.mjs
index 61062847..b735c65a 100644
--- a/module/data/actor/party.mjs
+++ b/module/data/actor/party.mjs
@@ -54,7 +54,6 @@ export default class DhParty extends BaseDataActor {
             const member = this.tagTeam.members[memberKey];
             member.damageRollData = member.rollData?.options.damage ? 
                 ChatDamageData.fromJSON(JSON.stringify(member.rollData.options.damage)) : null;
-            member.damageRollData?.prepareRolls();
         }
     }
 
diff --git a/module/data/chat-message/actorRoll.mjs b/module/data/chat-message/actorRoll.mjs
index 10f7ffa9..c2655610 100644
--- a/module/data/chat-message/actorRoll.mjs
+++ b/module/data/chat-message/actorRoll.mjs
@@ -164,8 +164,6 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
     }
 
     prepareDerivedData() {
-        this.damage.prepareRolls();
-
         if (this.hasTarget) {
             this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
             this.currentTargets = this.getTargetList();
diff --git a/module/data/chat-message/chatDamageData.mjs b/module/data/chat-message/chatDamageData.mjs
index 7217cce5..c233781c 100644
--- a/module/data/chat-message/chatDamageData.mjs
+++ b/module/data/chat-message/chatDamageData.mjs
@@ -1,6 +1,12 @@
 import { triggerChatRollFx } from '../../helpers/utils.mjs';
 
 export class ChatDamageData extends foundry.abstract.DataModel {
+    constructor(data = {}, options = {}) {
+        super(data, options);
+        
+        this._prepareRolls();
+    }
+
     static defineSchema() {
         const fields = foundry.data.fields;
         
@@ -21,7 +27,7 @@ export class ChatDamageData extends foundry.abstract.DataModel {
         if (!roll.evaluated) throw new Error('Roll objects added to ChatMessage documents must be evaluated');
     }
 
-    prepareRolls() {
+    _prepareRolls() {
         for (const key of Object.keys(this.types)) {
             const type = this.types[key];
             try {