Fix for when the last emitter is removed