A fish farm having a land-based fish tank (1a-e) and a water supply system (100) with a supply line (2C,D) and a discharge line (2A,B) fluidly connected to a water reservoir (3); a fluid intermediate storage (5,6, 56); a circulation conduit (9a-f) fluidly connected to the fish tank (1a-e); a valve arrangement ...