The last couple of years has seen a significant increase in fires caused by Lithium Ion batteries bursting into flames. The most deadly have happened when people bring their ebike or similar into their home for charging and/or safe keeping. Having dedicated charging areas will help mitigate this risk. However, if the charging area is within the building or right next to the building fire prevention measures need to be built in. It is therefore suggested to add a requirement for fire safety evaluation of charging areas taking into account the unique threat of Lithium Ion battery fires.