diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java
index db8c14d8a..544467cc9 100644
--- a/src/main/java/noppes/npcs/CommonProxy.java
+++ b/src/main/java/noppes/npcs/CommonProxy.java
@@ -60,7 +60,8 @@ public class CommonProxy implements IGuiHandler {
                     synchronized (serverPlayingAnimations) {
                         serverPlayingAnimations.removeIf(CommonProxy.this::removeAnimation);
                     }
-                } catch (Exception ignored) {
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
         }});
@@ -100,7 +101,8 @@ public class CommonProxy implements IGuiHandler {
         if (entity.worldObj != null && entity.worldObj.isRemote) {
             return animation.parent.animation != animation || clientRemoveAnimation(entity);
         } else {
-            return animation.parent.animation != animation && animation.parent.currentClientAnimation != animation
+            return !animation.parent.isClientAnimating()
+                || animation.parent.animation != animation && animation.parent.currentClientAnimation != animation
                 || entity.worldObj == null || !entity.worldObj.loadedEntityList.contains(entity)
                 || CustomNpcs.getServer().isServerStopped();
         }
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java
index 2f1b88478..dbd618fa5 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java
@@ -98,7 +98,7 @@ public class PlayerDataScript implements INpcScriptHandler {
     }
 
     public boolean isClient() {
-        return FMLCommonHandler.instance().getEffectiveSide().isClient();
+        return false;
     }
     public boolean getEnabled() {
         return ScriptController.Instance.playerScripts.enabled;