diff --git a/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c b/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c
index c26b56830..57d619126 100644
--- a/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c
+++ b/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c
@@ -83,6 +83,8 @@ _cogl_pipeline_vertend_fixed_add_layer (CoglPipeline *pipeline,
       _cogl_matrix_stack_set (unit->matrix_stack,
                               &authority->big_state->matrix);
 
+      _cogl_set_active_texture_unit (unit_index);
+
       _cogl_matrix_stack_flush_to_gl (unit->matrix_stack, COGL_MATRIX_TEXTURE);
     }
 
diff --git a/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c b/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c
index f32109e1d..fda8681b3 100644
--- a/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c
+++ b/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c
@@ -271,6 +271,8 @@ _cogl_pipeline_vertend_glsl_add_layer (CoglPipeline *pipeline,
       _cogl_matrix_stack_set (unit->matrix_stack,
                               &authority->big_state->matrix);
 
+      _cogl_set_active_texture_unit (unit_index);
+
       _cogl_matrix_stack_flush_to_gl (unit->matrix_stack, COGL_MATRIX_TEXTURE);
     }