diff --git a/module/data/chat-message/chatDamageData.mjs b/module/data/chat-message/chatDamageData.mjs
index 3c4c6b95..7217cce5 100644
--- a/module/data/chat-message/chatDamageData.mjs
+++ b/module/data/chat-message/chatDamageData.mjs
@@ -25,9 +25,8 @@ export class ChatDamageData extends foundry.abstract.DataModel {
         for (const key of Object.keys(this.types)) {
             const type = this.types[key];
             try {
-                const roll = Roll.fromData(type.roll);
-                type.roll = roll;
-                type.roll.modifierTotal = CONFIG.Dice.daggerheart.DHRoll.calculateTotalModifiers(roll);
+                type.roll = Roll.fromData(type.roll);
+                type.roll.modifierTotal = CONFIG.Dice.daggerheart.DHRoll.calculateTotalModifiers(type.roll);
             } catch {}
         }
     }
diff --git a/module/systemRegistration/migration-handlers/2_6_0.mjs b/module/systemRegistration/migration-handlers/2_6_0.mjs
index 1efd5600..9edda9a2 100644
--- a/module/systemRegistration/migration-handlers/2_6_0.mjs
+++ b/module/systemRegistration/migration-handlers/2_6_0.mjs
@@ -5,7 +5,7 @@ export class Migration_2_6_0 extends MigrationHandlerBase {
 
     /** @inheritdoc */
     async updateActorSource(actor) {
-        if (actor.type === 'party') {
+        if (actor.type === 'party' && Object.keys(actor.system.tagTeam.members).length) {
             return {
                 _id: actor._id,
                 system: {