diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl-xlib-renderer.c
index 03a822bc1..8b4d3ccc1 100644
--- a/cogl/cogl-xlib-renderer.c
+++ b/cogl/cogl-xlib-renderer.c
@@ -181,7 +181,7 @@ _cogl_xlib_renderer_disconnect (CoglRenderer *renderer)
 {
   CoglXlibRenderer *xlib_renderer = renderer->winsys;
 
-  if (!renderer->foreign_xdpy)
+  if (!renderer->foreign_xdpy && xlib_renderer->xdpy)
     XCloseDisplay (xlib_renderer->xdpy);
 
   unregister_xlib_renderer (renderer);