diff --git a/.pick_status.json b/.pick_status.json
index e5607302112..93613a7f450 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -9884,7 +9884,7 @@
         "description": "tc: don't unset resolve resource in set_framebuffer_state",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2eb45daa9c86f4b8bd602ddef7a67233f56f1edf",
         "notes": null
diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c
index c1de2345703..398e57b3933 100644
--- a/src/gallium/auxiliary/util/u_threaded_context.c
+++ b/src/gallium/auxiliary/util/u_threaded_context.c
@@ -1567,7 +1567,6 @@ tc_set_framebuffer_state(struct pipe_context *_pipe,
    tc_set_resource_batch_usage_persistent(tc, tc->fb_resources[PIPE_MAX_COLOR_BUFS], true);
    tc_set_resource_batch_usage_persistent(tc, tc->fb_resolve, true);
    tc->in_renderpass = false;
-   p->state.resolve = NULL;
 }
 
 struct tc_tess_state {