diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/ArmorHudEmulation1_8.java b/src/main/java/de/florianmichael/viafabricplus/fixes/ArmorHudEmulation1_8.java
index 5123bead..28f0a51c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/ArmorHudEmulation1_8.java
+++ b/src/main/java/de/florianmichael/viafabricplus/fixes/ArmorHudEmulation1_8.java
@@ -42,7 +42,7 @@ public class ArmorHudEmulation1_8 {
     private static double oldArmor = 0;
 
     public static void init() {
-        ClientTickEvents.START_WORLD_TICK.register(world -> {
+        ClientTickEvents.START_CLIENT_TICK.register(world -> {
             if (!VisualSettings.global().emulateArmorHud.isEnabled()) {
                 return;
             }
@@ -56,6 +56,8 @@ public class ArmorHudEmulation1_8 {
                         ViaFabricPlus.global().getLogger().error("Error sending armor update", t);
                     }
                 }
+            } else {
+                oldArmor = 0;
             }
         });
     }