diff --git a/Zafir/zafir.html b/Zafir/zafir.html
index ee11b4aaf9..db688118dd 100644
--- a/Zafir/zafir.html
+++ b/Zafir/zafir.html
@@ -3622,6 +3622,15 @@ on("clicked:initcombat", function() {
     ClearRepeatingSection("chargetracker");
     ReloadPrimaryWeapon(false);
 
+    // Setup max AP
+    getAttrs(["hp_max", "ap", "sp"], function(values) {
+        setAttrs({
+            hp: parseInt(values.hp_max)||0,
+            ap_max: parseInt(values.ap)||"",
+            sp_max: parseInt(values.sp)||""
+        });
+    });
+
     // Add all charges
     AddChargesToChargeTracker("activeabilities", "aablname", "aablcharges");
     AddChargesToChargeTracker("items", "itemname", "itemcharges");