diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 4ecaeb06..9ba52000 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -629,12 +629,12 @@ export default class CharacterSheet extends DHBaseActorSheet {
     }
 
     async updateArmorMarks(event) {
-        const armor = this.document.system.armor;
-        if (!armor) return;
+        const inputValue = Number(event.currentTarget.value);
+        const { value, max } = this.document.system.armorScore;
+        const changeValue = Math.min(inputValue - value, max - value);
 
-        const maxMarks = this.document.system.armorScore;
-        const value = Math.min(Math.max(Number(event.currentTarget.value), 0), maxMarks);
-        await armor.update({ 'system.marks.value': value });
+        event.currentTarget.value = inputValue < 0 ? 0 : value + changeValue;
+        this.document.system.updateArmorValue({ value: changeValue });
     }
 
     /* -------------------------------------------- */
@@ -813,10 +813,13 @@ export default class CharacterSheet extends DHBaseActorSheet {
      * Toggles ArmorScore resource value.
      * @type {ApplicationClickAction}
      */
-    static async #toggleArmor(_, button, element) {
-        const ArmorValue = Number.parseInt(button.dataset.value);
-        const newValue = this.document.system.armor.system.marks.value >= ArmorValue ? ArmorValue - 1 : ArmorValue;
-        await this.document.system.armor.update({ 'system.marks.value': newValue });
+    static async #toggleArmor(_, button, _element) {
+        const { value, max } = this.document.system.armorScore;
+        const inputValue = Number.parseInt(button.dataset.value);
+        const newValue = value >= inputValue ? inputValue - 1 : inputValue;
+        const changeValue = Math.min(newValue - value, max - value);
+
+        this.document.system.updateArmorValue({ value: changeValue });
     }
 
     /**
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs
index 5720f253..523c3974 100644
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@@ -35,9 +35,9 @@
                     {{#if useResourcePips}}
                     <div class='slot-value'>
                         <div class="slot-bar">
-                        {{#times document.system.armorScore}}
-                            <a class='armor-slot' data-action='toggleArmor'  data-value="{{add this 1}}">
-                                {{#if (gte ../document.system.armor.system.marks.value (add this 1))}}
+                        {{#times document.system.armorScore.max}}
+                            <a class='armor-slot' data-action='toggleArmor' data-value="{{add this 1}}">
+                                {{#if (gte ../document.system.armorScore.value (add this 1))}}
                                     <i class="fa-solid fa-shield"></i>
                                 {{else}}
                                     <i class="fa-solid fa-shield-halved"></i>
@@ -47,7 +47,7 @@
                         </div>
                         <div class="slot-label">
                             <span class="label">{{localize "DAGGERHEART.GENERAL.armorSlots"}}</span>
-                            <span class="value">{{document.system.armor.system.marks.value}} / {{document.system.armorScore}}</span>
+                            <span class="value">{{document.system.armorScore.value}} / {{document.system.armorScore.max}}</span>
                         </div> 
                     </div>
                     {{else}}