diff --git a/api/processors/averageDamageProcessor.ts b/api/processors/averageDamageProcessor.ts
index 9f818e2a..1d938ba3 100644
--- a/api/processors/averageDamageProcessor.ts
+++ b/api/processors/averageDamageProcessor.ts
@@ -49,8 +49,10 @@ export default class AverageDamageProcessor {
     if (mwModifier) {
       const mortalHits = attacks * mwModifier.resolve(this.profile);
       mortalDamage += mortalHits * mwModifier.getMortalWounds();
-      mortalDamage -= mortalDamage * this.target.resolveMortalSave(this.profile);
-      hits -= !mwModifier.inAddition ? mortalHits : 0;
+      mortalDamage = Math.max(mortalDamage - mortalDamage * this.target.resolveMortalSave(this.profile), 0);
+      if (!mwModifier.inAddition) {
+        hits = Math.max(hits - mortalHits, 0);
+      }
     }
 
     const cbModifier = this.profile.modifiers.getModifier(m.CONDITIONAL_BONUS, C.TO_HIT);
@@ -60,7 +62,7 @@ export default class AverageDamageProcessor {
       const cbModHits = attacks * cbModifier.resolve(this.profile);
       const splitProcessor = new AverageDamageProcessor(newProfile, this.target);
       splitDamage = splitProcessor.resolveWounds(cbModHits);
-      hits -= cbModHits;
+      hits = Math.max(hits - cbModHits, 0);
     }
 
     return this.resolveWounds(hits) + mortalDamage + splitDamage;
@@ -76,8 +78,10 @@ export default class AverageDamageProcessor {
     if (mwModifier) {
       const mortalToWounds = hits * mwModifier.resolve(this.profile);
       mortalDamage += mortalToWounds * mwModifier.getMortalWounds();
-      mortalDamage -= mortalDamage * this.target.resolveMortalSave(this.profile);
-      wounds -= !mwModifier.inAddition ? mortalToWounds : 0;
+      mortalDamage = Math.max(mortalDamage - mortalDamage * this.target.resolveMortalSave(this.profile), 0);
+      if (!mwModifier.inAddition) {
+        wounds = Math.max(wounds - mortalToWounds, 0);
+      }
     }
 
     const cbModifier = this.profile.modifiers.getModifier(m.CONDITIONAL_BONUS, C.TO_WOUND);
@@ -87,7 +91,7 @@ export default class AverageDamageProcessor {
       const cbModWounds = hits * cbModifier.resolve(this.profile);
       const splitProcessor = new AverageDamageProcessor(newProfile, this.target);
       splitDamage = splitProcessor.resolveSaves(cbModWounds);
-      wounds -= cbModWounds;
+      wounds = Math.max(wounds - cbModWounds, 0);
     }
 
     return this.resolveSaves(wounds) + mortalDamage + splitDamage;
@@ -102,6 +106,6 @@ export default class AverageDamageProcessor {
   resolveDamage(successful: number) {
     const damage = successful * this.profile.getDamage();
     const saves = damage * this.target.resolveFNP(this.profile);
-    return damage - saves;
+    return Math.max(damage - saves, 0);
   }
 }
diff --git a/client/package.json b/client/package.json
index 97e50566..b51be02c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "statshammer",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "private": true,
     "proxy": "http://localhost:5000/",
     "dependencies": {
diff --git a/lerna.json b/lerna.json
index 7261f0ea..0afbb21a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -3,6 +3,6 @@
         "*",
         "."
     ],
-    "version": "2.1.4",
+    "version": "2.1.5",
     "npmClient": "yarn"
 }
diff --git a/package.json b/package.json
index 726ea3ff..8c511fcb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "statshammer-express",
     "private": true,
-    "version": "2.1.4",
+    "version": "2.1.5",
     "engines": {
         "node": "12.18.3",
         "yarn": "1.22.4"