diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 932c0bf1934..4ec6b9d765c 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -318,7 +318,7 @@ __glXIsDirect(Display * dpy, GLXContextID contextID, Bool *error)
 static GLXContext
 CreateContext(Display *dpy, int generic_id, struct glx_config *config,
               GLXContext shareList_user, Bool allowDirect,
-	      unsigned code, int renderType, int screen)
+	      unsigned code, int renderType)
 {
    struct glx_context *gc;
    struct glx_screen *psc;
@@ -326,7 +326,7 @@ CreateContext(Display *dpy, int generic_id, struct glx_config *config,
    if (dpy == NULL)
       return NULL;
 
-   psc = GetGLXScreenConfigs(dpy, screen);
+   psc = GetGLXScreenConfigs(dpy, config->screen);
    if (psc == NULL)
       return NULL;
 
@@ -364,7 +364,7 @@ CreateContext(Display *dpy, int generic_id, struct glx_config *config,
       req->glxCode = X_GLXCreateContext;
       req->context = gc->xid = XAllocID(dpy);
       req->visual = generic_id;
-      req->screen = screen;
+      req->screen = config->screen;
       req->shareList = shareList ? shareList->xid : None;
       req->isDirect = gc->isDirect;
       break;
@@ -379,7 +379,7 @@ CreateContext(Display *dpy, int generic_id, struct glx_config *config,
       req->glxCode = X_GLXCreateNewContext;
       req->context = gc->xid = XAllocID(dpy);
       req->fbconfig = generic_id;
-      req->screen = screen;
+      req->screen = config->screen;
       req->renderType = renderType;
       req->shareList = shareList ? shareList->xid : None;
       req->isDirect = gc->isDirect;
@@ -400,7 +400,7 @@ CreateContext(Display *dpy, int generic_id, struct glx_config *config,
       req->vendorCode = X_GLXvop_CreateContextWithConfigSGIX;
       req->context = gc->xid = XAllocID(dpy);
       req->fbconfig = generic_id;
-      req->screen = screen;
+      req->screen = config->screen;
       req->renderType = renderType;
       req->shareList = shareList ? shareList->xid : None;
       req->isDirect = gc->isDirect;
@@ -472,7 +472,7 @@ glXCreateContext(Display * dpy, XVisualInfo * vis,
 #endif
 
    return CreateContext(dpy, vis->visualid, config, shareList, allowDirect,
-                        X_GLXCreateContext, renderType, vis->screen);
+                        X_GLXCreateContext, renderType);
 }
 
 static void
@@ -1645,8 +1645,7 @@ glXCreateNewContext(Display * dpy, GLXFBConfig fbconfig,
    }
 
    return CreateContext(dpy, config->fbconfigID, config, shareList,
-			allowDirect, X_GLXCreateNewContext, renderType,
-			config->screen);
+			allowDirect, X_GLXCreateNewContext, renderType);
 }
 
 
@@ -2045,8 +2044,7 @@ glXCreateContextWithConfigSGIX(Display * dpy,
        && __glXExtensionBitIsEnabled(psc, SGIX_fbconfig_bit)) {
       gc = CreateContext(dpy, config->fbconfigID, config, shareList,
                          allowDirect,
-			 X_GLXvop_CreateContextWithConfigSGIX, renderType,
-			 config->screen);
+			 X_GLXvop_CreateContextWithConfigSGIX, renderType);
    }
 
    return gc;