diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
index 61cf16417b..666b5e8133 100644
--- a/gdk/gdkgl.c
+++ b/gdk/gdkgl.c
@@ -367,7 +367,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
 
   clip_region = gdk_cairo_region_from_clip (cr);
 
-  if (gdk_gl_context_get_current () != paint_context)
+  if ((gdk_gl_context_get_current () != NULL) && (gdk_gl_context_get_current () != paint_context))
     sync = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
 
   gdk_gl_context_make_current (paint_context);