diff --git a/clutter/deprecated/clutter-cairo-texture.c b/clutter/deprecated/clutter-cairo-texture.c
index 9b4a3067d..c9bf3a21f 100644
--- a/clutter/deprecated/clutter-cairo-texture.c
+++ b/clutter/deprecated/clutter-cairo-texture.c
@@ -347,9 +347,6 @@ clutter_cairo_texture_emit_draw (ClutterCairoTexture        *self,
   g_assert (self->priv->cr_surface != NULL);
 
   cr = cairo_create (self->priv->cr_surface);
-  cairo_set_user_data (cr, &clutter_cairo_texture_context_key,
-                       ctxt,
-                       clutter_cairo_texture_context_destroy);
 
   if (ctxt->is_clipped)
     {
@@ -368,6 +365,8 @@ clutter_cairo_texture_emit_draw (ClutterCairoTexture        *self,
 
   self->priv->cr_context = NULL;
 
+  clutter_cairo_texture_context_destroy (ctxt);
+
   cairo_destroy (cr);
 }