diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c
index e685c7cd8..d806bfd50 100644
--- a/src/cairo-xlib-display.c
+++ b/src/cairo-xlib-display.c
@@ -492,7 +492,7 @@ _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t	*display,
 
     xrender_format = display->cached_xrender_formats[format];
     if (xrender_format == NULL) {
-	int pict_format;
+	int pict_format = 0;
 
 	switch (format) {
 	case CAIRO_FORMAT_A1:
@@ -515,9 +515,10 @@ _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t	*display,
 	case CAIRO_FORMAT_ARGB32:
 	    pict_format = PictStandardARGB32; break;
 	}
-	if (!xrender_format)
-	    xrender_format = XRenderFindStandardFormat (display->display,
-		                                        pict_format);
+	if (pict_format) {
+	    xrender_format =
+		XRenderFindStandardFormat (display->display, pict_format);
+	}
 	display->cached_xrender_formats[format] = xrender_format;
     }