diff --git a/mi/miinitext.c b/mi/miinitext.c
index 55faec333..4f252d41f 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -661,7 +661,8 @@ InitExtensions(argc, argv)
 #endif
 
 #ifdef GLXEXT
-    GlxPushProvider(&__glXDRISWRastProvider);
+    if (serverGeneration == 1)
+	GlxPushProvider(&__glXDRISWRastProvider);
     if (!noGlxExtension) GlxExtensionInit();
 #endif
 }