diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index d7bc484b7d7..ccf9b6cd564 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -739,7 +739,10 @@ glx_screen_cleanup(struct glx_screen *psc)
       psc->visuals = NULL;   /* NOTE: just for paranoia */
    }
 #if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
-   driDestroyConfigs(psc->driver_configs);
+   if (psc->driver_configs) {
+      driDestroyConfigs(psc->driver_configs);
+      psc->driver_configs = NULL;
+   }
    /* Free the direct rendering per screen data */
    driDestroyScreen(psc->frontend_screen);
 #endif