A device for discharging milk and/or milk froth, including a pump to convey milk from a container, a flow-heater, and an output for discharging milk, embodied cooperating with each other such that milk conveyed via the pump and heated via the flow-heater can be discharged from the output. At least one steam generator is provided cooperating with the flow-heater such that downstream in reference to the flow-heater and upstream in reference to the output, steam can be fed to the milk for an additional heating step. An air valve to create milk froth is provided, and the air valve is openable to introduce air upstream in reference to the flow-heater.
