The invention provides a transport device for transporting pucks which are configured for container transport, comprising a puck transport section for transporting pucks to and from a container treatment machine. The transport device comprises a puck buffer from which pucks can be coupled into the puck transport section and to which pucks decoupled from the puck transport section can be fed.