This paper explores the role of negotiation in teacher-student interaction and argues that the negotiation of meaning, defined as a set of conversational moves which work toward mutual comprehension, is too narrow a construct to fulfil its pedagogical potential in teacher-student interaction in communicative and content-based second language (L2) classrooms. Drawing on examples from immersion classrooms, where the overriding focus is on delivery of subject matter in the L2, an argument is presented in support of a more comprehensive view of negotiation that accounts for corrective feedback and distinguishes between meaning-focused and form-focused negotiation.