I've had the same problem with my Haibike sduro Yamaha. The lock latching is not holding the battery tight to the lock as it should. Three friends have the same bike without this issue. The problem can be solved as described in this thread but I wonder if there is a way of adjusting the lock...