Baxi 105e hot water problem?

When the shower is turned on the boiler fires but does not modulate when the desired temp is reached resulting in the water being to hot and the boiler switching off but not on the safety cut out. As the boiler modulates when the heating is on the gas valve seems to be ok.