diff --git a/GL/glx/glxvisuals.c b/GL/glx/glxvisuals.c
index 0e9bdedec..46b380b3d 100644
--- a/GL/glx/glxvisuals.c
+++ b/GL/glx/glxvisuals.c
@@ -55,6 +55,7 @@
 
 void GlxWrapInitVisuals(miInitVisualsProcPtr *);
 
+extern Bool noGlxVisualInit;
 #include "glcontextmodes.h"
 
 struct ScreenVisualsRec {
@@ -452,14 +453,15 @@ Bool GlxInitVisuals(VisualPtr *visualp, DepthPtr *depthp,
     /*
      * Setup the visuals supported by this particular screen.
      */
-    init_visuals(nvisualp, visualp, defaultVisp,
-		 *ndepthp, *depthp, *rootDepthp);
+    if (!noGlxVisualInit) {
+        init_visuals(nvisualp, visualp, defaultVisp,
+                     *ndepthp, *depthp, *rootDepthp);
+    }
 
 
     return True;
 }
 
-
 /************************************************************************/
 
 
diff --git a/os/utils.c b/os/utils.c
index 36c8dfeb3..31cb0af92 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -160,6 +160,7 @@ _X_EXPORT Bool noFontCacheExtension = FALSE;
 #endif
 #ifdef GLXEXT
 _X_EXPORT Bool noGlxExtension = FALSE;
+_X_EXPORT Bool noGlxVisualInit = FALSE;
 #endif
 #ifdef SCREENSAVER
 _X_EXPORT Bool noScreenSaverExtension = FALSE;