diff --git a/module/data/action/attackAction.mjs b/module/data/action/attackAction.mjs
index 62463d15..68afc23b 100644
--- a/module/data/action/attackAction.mjs
+++ b/module/data/action/attackAction.mjs
@@ -51,11 +51,13 @@ export default class DHAttackAction extends DHDamageAction {
         const labels = [];
         const { roll, range, damage } = this;
 
-        if (roll.trait) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${roll.trait}.short`))
+        if (roll.trait) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${roll.trait}.short`));
         if (range) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.short`));
 
-        for (const { value, type } of damage.parts) {
-            const str = Roll.replaceFormulaData(value.getFormula(), this.actor?.getRollData() ?? {});
+        const useAltDamage = this.actor?.effects?.find(x => x.type === 'horde')?.active;
+        for (const { value, valueAlt, type } of damage.parts) {
+            const usedValue = useAltDamage ? valueAlt : value;
+            const str = Roll.replaceFormulaData(usedValue.getFormula(), this.actor?.getRollData() ?? {});
 
             const icons = Array.from(type)
                 .map(t => CONFIG.DH.GENERAL.damageTypes[t]?.icon)
diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index e64c64f3..a4dfddf5 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -129,7 +129,7 @@ export default class DhpAdversary extends BaseDataActor {
                 CONFIG.DH.id,
                 CONFIG.DH.SETTINGS.gameSettings.Automation
             ).hordeDamage;
-            if (autoHordeDamage && changes.system?.resources?.hitPoints?.value) {
+            if (autoHordeDamage && changes.system?.resources?.hitPoints?.value !== undefined) {
                 const hordeActiveEffect = this.parent.effects.find(x => x.type === 'horde');
                 if (hordeActiveEffect) {
                     const halfHP = Math.ceil(this.resources.hitPoints.max / 2);