diff --git a/.pick_status.json b/.pick_status.json
index 0f42c10b83b..d8311a904a1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3454,7 +3454,7 @@
         "description": "xlib: clear currentDpy when releasing the current context",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "abe6d750e58d371624de75f4bad365c61e0196c1",
         "notes": null
diff --git a/src/gallium/frontends/glx/xlib/glx_api.c b/src/gallium/frontends/glx/xlib/glx_api.c
index 9ee3c94882b..e1d98369d09 100644
--- a/src/gallium/frontends/glx/xlib/glx_api.c
+++ b/src/gallium/frontends/glx/xlib/glx_api.c
@@ -1236,6 +1236,8 @@ glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
    }
    else if (!ctx && !draw && !read) {
       /* release current context w/out assigning new one. */
+      if (current)
+         current->currentDpy = NULL;
       XMesaMakeCurrent2( NULL, NULL, NULL );
       SetCurrentContext(NULL);
       return True;