A surfboard with a surfboard body (1) extending along a longitudinal direction (L) and having an upper surface and a bottom surface. An electrical battery pack (2) is removably positioned in an upper compartment accessible from the upper surface. An electrically driven water-jet configured to propel the surfboard is provided with electrical power from the electrical battery pack. The electrically driven water-jet is provided in a propulsion module (3) that is removably positioned in a lower compartment accessible from the lower surface. The upper compartment and the lower compartment partly overlaps each other as seen along the longitudinal direction (L).