diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java
index 3f0270f9d..08510d08e 100644
--- a/src/main/java/noppes/npcs/CommonProxy.java
+++ b/src/main/java/noppes/npcs/CommonProxy.java
@@ -64,7 +64,9 @@ public class CommonProxy implements IGuiHandler {
     }
 
     private boolean removeAnimation(Animation animation) {
-        if (animation.parent == null || animation.parent.animation != animation) return true;
+        if (animation.currentFrame() == null || animation.parent == null || animation.parent.animation != animation) {
+            return true;
+        }
 
         Entity entity = null;
         if (animation.parent.parent instanceof DataDisplay) {