At our predominantly white university, students often shy away from controversial conversations. How can the classroom encourage students to value and engage in potentially explosive conversations? We develop a concept of "empathic scaffolding" to articulate an approach that integrates diversity and inclusion into the classroom. Empathic scaffolding structures content and pedagogy in a way that strategically expands students' zones of comfort, starting with very personal experiences with the material and expanding to include broader groups of people and course concepts. Understanding and engaging with these concentric circles of students' relationships to the course material is crucial if students are to hear and engage with voices to which they may have limited exposure. This article documents the best practices of implementing empathic scaffolding in the realms of content and pedagogy, offering a toolkit for professors to critically engage conversations about race and social justice.