diff --git a/.pick_status.json b/.pick_status.json
index e117817f75a..be8a06de0f2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5143,7 +5143,7 @@
         "description": "mesa/st: call memobj_destroy only if there is memory imported",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "99cf9108340c2ccf7c1b05ec6f951e2e91b9c76c"
     },
diff --git a/src/mesa/state_tracker/st_cb_memoryobjects.c b/src/mesa/state_tracker/st_cb_memoryobjects.c
index 3ef316a45f8..917e39a91dc 100644
--- a/src/mesa/state_tracker/st_cb_memoryobjects.c
+++ b/src/mesa/state_tracker/st_cb_memoryobjects.c
@@ -59,7 +59,8 @@ st_memoryobj_free(struct gl_context *ctx,
    struct pipe_context *pipe = st->pipe;
    struct pipe_screen *screen = pipe->screen;
 
-   screen->memobj_destroy(screen, st_obj->memory);
+   if (st_obj->memory)
+      screen->memobj_destroy(screen, st_obj->memory);
    _mesa_delete_memory_object(ctx, obj);
 }