diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f7789d4ef..177187321 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -4610,10 +4610,7 @@ _xwindow_get_shape (Display *xdisplay,
 			     window,
 			     shape_type, &rn, &ord);
 
-  if (xrl == NULL)
-    return NULL; /* XShape not supported */
-
-  if (rn == 0)
+  if (xrl == NULL || rn == 0)
     return gdk_region_new (); /* Empty */
 
   if (ord != YXBanded)