Pump or motor having a rotor with chambers with a through rotation variable volume which are connectable via switches to either a first line connection or a second line connection. During switching between the line connections, the volume of the chamber changes and to avoid pressure peaks or cavitation the chambers are interconnected with connecting lines. Each connecting line has closures to stop the flow through the connecting line after a limited volume of fluid has passed in one direction.