diff --git a/src/cairo-clip.c b/src/cairo-clip.c
index f890c071a..696c5b1a9 100644
--- a/src/cairo-clip.c
+++ b/src/cairo-clip.c
@@ -1109,8 +1109,9 @@ _cairo_clip_contains_rectangle (cairo_clip_t *clip,
 {
     cairo_clip_path_t *clip_path;
 
+    /* clip == NULL means no clip, so the clip contains everything */
     if (clip == NULL)
-	return FALSE;
+	return TRUE;
 
     clip_path = clip->path;
     if (clip_path->extents.x > rect->x ||
@@ -1148,9 +1149,6 @@ _cairo_clip_contains_extents (cairo_clip_t *clip,
 {
     const cairo_rectangle_int_t *rect;
 
-    if (clip == NULL)
-	return FALSE;
-
     rect = extents->is_bounded ? &extents->bounded : &extents->unbounded;
     return _cairo_clip_contains_rectangle (clip, rect);
 }