diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 2ae5becfa..890fb6fcc 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -229,8 +229,6 @@ static Bool DarwinAddScreen(int index, ScreenPtr pScreen, int argc, char **argv)
 
     miSetPixmapDepths();
 
-    setVisualConfigs();
-
     // machine independent screen init
     // setup _Screen structure in pScreen
     if (monitorResolution)
@@ -602,6 +600,10 @@ void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
         generation = serverGeneration;
     }
 
+#ifdef GLXEXT
+    setVisualConfigs();    
+#endif
+
     // Discover screens and do mode specific initialization
     QuartzInitOutput(argc, argv);