diff --git a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
index 2f56260cf..ec9e4a415 100644
--- a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
@@ -474,8 +474,8 @@ public class CommandTrait extends Trait {
             if (command.startsWith("say")) {
                 cmd = "npc speak " + command.replaceFirst("say", "").trim() + " --target <p>";
             }
-            if ((command.startsWith("npc ") || command.startsWith("waypoints ") || command.startsWith("wp "))
-                    && !command.contains("--id ")) {
+            if ((cmd.startsWith("npc ") || cmd.startsWith("waypoints ") || cmd.startsWith("wp "))
+                    && !cmd.contains("--id ")) {
                 cmd += " --id <id>";
             }
             String interpolatedCommand = Placeholders.replace(cmd, clicker, npc);