diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c
index 90ef988c4..aa8bae85d 100644
--- a/cogl/cogl-context.c
+++ b/cogl/cogl-context.c
@@ -213,6 +213,8 @@ cogl_context_new (CoglDisplay *display,
   _cogl_pipeline_init_layer_state_hash_functions ();
 
   context->enable_flags = 0;
+  context->current_clip_stack_valid = FALSE;
+  context->current_clip_stack = NULL;
 
   context->enable_backface_culling = FALSE;
   context->flushed_front_winding = COGL_FRONT_WINDING_COUNTER_CLOCKWISE;
@@ -309,8 +311,6 @@ cogl_context_new (CoglDisplay *display,
       cogl_object_unref (COGL_FRAMEBUFFER (window));
     }
 
-  _context->current_clip_stack_valid = FALSE;
-
   context->dirty_bound_framebuffer = TRUE;
   context->dirty_gl_viewport = TRUE;