diff --git a/src/server/tools/command_tool.ts b/src/server/tools/command_tool.ts
index 0dbdfd648..a984edebb 100644
--- a/src/server/tools/command_tool.ts
+++ b/src/server/tools/command_tool.ts
@@ -10,7 +10,10 @@ class CommandTool extends Tool {
 
   use = function (self: CommandTool, player: Player, session: PlayerSession) {
     if (self.isCustom) {
-      const firstSpace = self.command.indexOf(" ");
+      let firstSpace = self.command.indexOf(" ");
+      if (firstSpace == -1) {
+        firstSpace = self.command.length;
+      }
       const usingItem = session.usingItem;
       session.usingItem = false;
       Server.command.callCommand(player, self.command.substring(0, firstSpace).trim(), self.command.substring(firstSpace).trim());