diff --git a/.pick_status.json b/.pick_status.json
index 1042ae868a4..7d8c6b14b6c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2964,7 +2964,7 @@
         "description": "wgl: Check for stw_device->screen before trying to destroy it",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/frontends/wgl/stw_device.c b/src/gallium/frontends/wgl/stw_device.c
index 2f852aca0aa..655ae68be48 100644
--- a/src/gallium/frontends/wgl/stw_device.c
+++ b/src/gallium/frontends/wgl/stw_device.c
@@ -258,7 +258,8 @@ stw_cleanup(void)
    st_screen_destroy(stw_dev->fscreen);
    FREE(stw_dev->fscreen);
 
-   stw_dev->screen->destroy(stw_dev->screen);
+   if (stw_dev->screen)
+      stw_dev->screen->destroy(stw_dev->screen);
 
    stw_tls_cleanup();