diff --git a/clutter/glx/clutter-stage-glx.c b/clutter/glx/clutter-stage-glx.c
index 954d347e4..d74708577 100644
--- a/clutter/glx/clutter-stage-glx.c
+++ b/clutter/glx/clutter-stage-glx.c
@@ -377,14 +377,15 @@ clutter_stage_glx_add_redraw_clip (ClutterStageWindow *stage_window,
   if (clutter_stage_glx_ignoring_redraw_clips (stage_window))
     return;
 
-  /* Do nothing on an empty clip, to avoid confusing with the flag degenerate clip */
-  if (stage_clip->width == 0)
+  /* Do nothing on an empty clip, to avoid confusing with the flag degenerate
+   * clip */
+  if (stage_clip != NULL && stage_clip->width == 0)
     return;
 
   /* A NULL stage clip means a full stage redraw has been queued and
    * we keep track of this by setting a degenerate
    * stage_glx->bounding_redraw_clip */
-  if (!stage_clip)
+  if (stage_clip == NULL)
     {
       stage_glx->bounding_redraw_clip.width = 0;
       return;