An arrangement for storing thermal energy, having at least one subterranean chamber for holding a first fluid is provided. A passage holding a second fluid is extended outside at least a part of the chamber. At least one channel is arranged to allow fluid communication of the first fluid between different sections of the chamber, and/or allow fluid communication of the second fluid between different sections of the passage.