diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -406,13 +406,7 @@ CommandCost CmdRenameWaypoint(TileIndex 
 
 	if (flags & DC_EXEC) {
 		free(wp->name);
-
-		if (reset) {
-			wp->name = NULL;
-			MakeDefaultName(wp);
-		} else {
-			wp->name = strdup(text);
-		}
+		wp->name = reset ? NULL : strdup(text);
 
 		wp->UpdateVirtCoord();
 	}