Recently, the debate centred on emotion in the workplace has stagnated around various interpretations of Hochschild's term 'emotional labour', with all of the negative connotations her analysis brings. This paper introduces a typology of workplace emotion that offers a multi-dimensional conceptualisation of emotion in organisations that is better able to capture not only the frustration, dissatisfaction and exhaustion so often associated with emotion work but also the humour, the compassion and the pleasure