diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerAnimationImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerAnimationImpl.java
index dfca38f4b..6b260e8ce 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerAnimationImpl.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerAnimationImpl.java
@@ -62,7 +62,7 @@ public class PlayerAnimationImpl {
 
                     @Override
                     public void run() {
-                        if (player.dead || !player.valid
+                        if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
                                 || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
                             cancel();
                             return;
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerAnimationImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerAnimationImpl.java
index 4712eaa08..ae50b08eb 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerAnimationImpl.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerAnimationImpl.java
@@ -62,7 +62,7 @@ public class PlayerAnimationImpl {
 
                     @Override
                     public void run() {
-                        if (player.dead || !player.valid
+                        if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
                                 || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
                             cancel();
                             return;
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerAnimationImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerAnimationImpl.java
index d7b030c8c..0fbbbcd16 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerAnimationImpl.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerAnimationImpl.java
@@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
 
                     @Override
                     public void run() {
-                        if (player.dead || !player.valid
+                        if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
                                 || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
                             cancel();
                             return;
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
index f239abca9..2be18323d 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
@@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
 
                     @Override
                     public void run() {
-                        if (player.dead || !player.valid
+                        if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
                                 || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
                             cancel();
                             return;
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerAnimationImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerAnimationImpl.java
index 6a4f11f93..5c0341cec 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerAnimationImpl.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerAnimationImpl.java
@@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
 
                     @Override
                     public void run() {
-                        if (player.dead || !player.valid
+                        if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
                                 || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
                             cancel();
                             return;
@@ -137,9 +137,9 @@ public class PlayerAnimationImpl {
         NMSImpl.sendPacketNearby(player.getBukkitEntity(), player.getBukkitEntity().getLocation(), packet, radius);
     }
 
+    private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
     private static final MethodHandle ENTITY_SETPOSE_METHOD = NMS.getMethodHandle(Entity.class, "setPose", true,
             EntityPose.class);
-    private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
     static {
         DEFAULTS.put(PlayerAnimation.ARM_SWING, 0);
         DEFAULTS.put(PlayerAnimation.HURT, 1);
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java
index c80585c1f..d53ae4314 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java
@@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
 
                     @Override
                     public void run() {
-                        if (player.dead || !player.valid
+                        if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
                                 || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
                             cancel();
                             return;
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java
index 569fde705..8d6adae9b 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java
@@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
 
                     @Override
                     public void run() {
-                        if (player.dead || !player.valid
+                        if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
                                 || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
                             cancel();
                             return;
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerAnimationImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerAnimationImpl.java
index 9650736f5..40bff4387 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerAnimationImpl.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerAnimationImpl.java
@@ -60,7 +60,7 @@ public class PlayerAnimationImpl {
 
                     @Override
                     public void run() {
-                        if (player.dead || !player.valid
+                        if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
                                 || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
                             cancel();
                             return;