This study documents our efforts to implement an "ethic of discomfort" and a "pedagogy of discomfort" in our undergraduate multicultural teacher education courses. Commitments to these moral imperatives inherently involve emotional work for teacher candidates and teacher educators. Such emotional work, particularly in academia, is often invisible and disincentivized. This study examines the following: (1) grappling with students' emotional reactions that stem from discomfort, (2) engaging in public emotional discourses, (3) negotiating the political dimensions of teaching diverse students, and (4) remaining emotionally available to students as they work through these ideas in their own lives. The implications of this study address the types of preparation and support teacher educators need to facilitate the transformative potential of a pedagogy and an ethic of discomfort. While pre-service teacher education is considered a safe and productive learning space for students to be discomforted, questions are posed regarding the safety for pre-tenured teacher educators involved in this process. We offer a typology of emotional work from a teacher educator perspective in teaching multicultural education.