diff --git a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
index 0dc1f6fcf..2d36026b4 100644
--- a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
@@ -99,7 +99,7 @@ public class CommandTrait extends Trait {
         NPCShopAction action = null;
         if (player.hasPermission("citizens.npc.command.ignoreerrors.*"))
             return Transaction.success();
-        if (cost > 0 && !player.hasPermission("citizens.npc.command.ignoreerrors.cost")) {
+        if (cost != 0 && !player.hasPermission("citizens.npc.command.ignoreerrors.cost")) {
             action = new MoneyAction(cost);
             if (!action.take(player, null, 1).isPossible()) {
                 sendErrorMessage(player, CommandTraitError.MISSING_MONEY, null, cost);
@@ -119,7 +119,8 @@ public class CommandTrait extends Trait {
                         stack.getAmount());
             }
         }
-        if (command.cost != -1 && !player.hasPermission("citizens.npc.command.ignoreerrors.cost")) {
+        if (command.cost != -1 && command.cost != 0
+                && !player.hasPermission("citizens.npc.command.ignoreerrors.cost")) {
             action = new MoneyAction(command.cost);
             if (!action.take(player, null, 1).isPossible()) {
                 sendErrorMessage(player, CommandTraitError.MISSING_MONEY, null, command.cost);
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
index 38538705b..a97caec7f 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
@@ -1135,9 +1135,6 @@ public class NMSImpl implements NMSBridge {
         return () -> {
             if (!entity.isValid())
                 return;
-            if (npc != null && npc.useMinecraftAI()) {
-                player.movementTick();
-            }
             player.playerTick();
         };
     }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
index d1a40d7f7..569fb66a1 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
@@ -1152,9 +1152,6 @@ public class NMSImpl implements NMSBridge {
         return () -> {
             if (!entity.isValid())
                 return;
-            if (npc != null && npc.useMinecraftAI()) {
-                player.movementTick();
-            }
             player.playerTick();
         };
     }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
index 7bc479b71..405fe41ab 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
@@ -1176,9 +1176,6 @@ public class NMSImpl implements NMSBridge {
         return () -> {
             if (!entity.isValid())
                 return;
-            if (npc != null && npc.useMinecraftAI()) {
-                player.movementTick();
-            }
             player.playerTick();
         };
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
index e677030f8..ccc48007f 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
@@ -1182,9 +1182,6 @@ public class NMSImpl implements NMSBridge {
         return () -> {
             if (!entity.isValid())
                 return;
-            if (npc != null && npc.useMinecraftAI()) {
-                player.aiStep();
-            }
             player.doTick();
         };
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
index 56a2a53ae..5b1958c01 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
@@ -1191,9 +1191,6 @@ public class NMSImpl implements NMSBridge {
         return () -> {
             if (!entity.isValid())
                 return;
-            if (npc != null && npc.useMinecraftAI()) {
-                player.aiStep();
-            }
             player.doTick();
         };
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
index d0334db9f..37b00d17e 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
@@ -1318,9 +1318,6 @@ public class NMSImpl implements NMSBridge {
         return () -> {
             if (!entity.isValid())
                 return;
-            if (npc != null && npc.useMinecraftAI()) {
-                player.aiStep();
-            }
             player.doTick();
         };
     }
diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/util/NMSImpl.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/util/NMSImpl.java
index 1b70513ac..96faad738 100644
--- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/util/NMSImpl.java
+++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/util/NMSImpl.java
@@ -1290,9 +1290,6 @@ public class NMSImpl implements NMSBridge {
         return () -> {
             if (!entity.isValid())
                 return;
-            if (npc != null && npc.useMinecraftAI()) {
-                player.aiStep();
-            }
             player.doTick();
         };
     }
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
index c2762f57f..c144ea3d8 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
@@ -909,9 +909,6 @@ public class NMSImpl implements NMSBridge {
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
             entity.l();
-            if (npc != null && npc.useMinecraftAI()) {
-                entity.m();
-            }
             if (!removeFromPlayerList)
                 return;
             if (!entity.dead) {