This article provides best practices that instructors can use to affirm and support marginalized students' mental health with a specific focus on students of color. Recently, campuses have witnessed renewed calls for diversity and inclusion in the wake of anti-Black violence. Advocates have called for needed structural changes. To build upon these calls for change, this article provides instructors with tools they can use in the interim to navigate questions of diversity, inclusion, and justice in the classroom. The essay centers the mental health needs of students from marginalized populations to hedge against the possibility that efforts to foster inclusion, including advocating for structural reform, contribute additional trauma to these students.