The present disclosure relates to a filling machine and a method for filling up pasty or liquid masses, for example for sausage production, with a feed pump, in particular a vane pump, for conveying the pasty or liquid masses, a vacuum pump for generating a vacuum in the feed pump, in particular the vane cells of the vane pump, wherein the feed pump may be connected with the vacuum pump via a first channel and via an integrated collecting vessel for entrained ingredients. According to the present disclosure, a supply means is provided via which the feed pump may be optionally additionally connected with an external collecting vessel via the first channel. The operator may thus choose between two different operating modes with and without an external collecting vessel.