diff --git a/town_cmd.c b/town_cmd.c
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -1447,7 +1447,7 @@ int32 CmdRenameTown(int x, int y, uint32
 	StringID str;
 	Town *t;
 
-	if (!IsTownIndex(p1)) return CMD_ERROR;
+	if (!IsTownIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 
 	t = GetTown(p1);