diff --git a/.pick_status.json b/.pick_status.json
index dcf76e2019c..24108053c8c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2614,7 +2614,7 @@
         "description": "gallium: Reset {d,r}Priv in dri_unbind_context",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/frontends/dri/dri_context.c b/src/gallium/frontends/dri/dri_context.c
index 39eae5f7587..55bfa224bcf 100644
--- a/src/gallium/frontends/dri/dri_context.c
+++ b/src/gallium/frontends/dri/dri_context.c
@@ -271,6 +271,8 @@ dri_unbind_context(__DRIcontext * cPriv)
          stapi->make_current(stapi, NULL, NULL, NULL);
       }
    }
+   ctx->dPriv = NULL;
+   ctx->rPriv = NULL;
 
    return GL_TRUE;
 }