diff --git a/src/main/java/net/torocraft/torohealth/bars/BarStates.java b/src/main/java/net/torocraft/torohealth/bars/BarStates.java
index 17e282d1..7a446ed5 100644
--- a/src/main/java/net/torocraft/torohealth/bars/BarStates.java
+++ b/src/main/java/net/torocraft/torohealth/bars/BarStates.java
@@ -17,7 +17,7 @@ public class BarStates {
   public static BarState getState(LivingEntity entity) {
     int id = entity.getEntityId();
     BarState state = STATES.get(id);
-    if (state == null) {
+    if (state == null || state.entity != entity) {
       state = new BarState(entity);
       STATES.put(id, state);
     }
diff --git a/src/main/java/net/torocraft/torohealth/display/Hud.java b/src/main/java/net/torocraft/torohealth/display/Hud.java
index 559e3e3a..37043697 100644
--- a/src/main/java/net/torocraft/torohealth/display/Hud.java
+++ b/src/main/java/net/torocraft/torohealth/display/Hud.java
@@ -99,7 +99,12 @@ private void draw(MatrixStack matrix, float x, float y, float scale) {
     if (entity == null) {
       return;
     }
-
+    
+    if(client.world.getEntityById(entity.getEntityId()) != entity) {
+      setEntityWork(null);
+      return;
+    }
+    
     matrix.push();
     matrix.scale(scale, scale, scale);
     matrix.translate(x - 10, y - 10, 0);