diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c
index f3433640827..b0674f8f1ab 100644
--- a/src/gallium/drivers/zink/zink_batch.c
+++ b/src/gallium/drivers/zink/zink_batch.c
@@ -242,6 +242,7 @@ create_batch_state(struct zink_context *ctx)
       goto fail;
 
    util_queue_fence_init(&bs->flush_completed);
+   bs->queue = screen->threaded ? screen->thread_queue : screen->queue;
 
    return bs;
 fail:
@@ -619,11 +620,9 @@ zink_end_batch(struct zink_context *ctx, struct zink_batch *batch)
       return;
 
    if (screen->threaded) {
-      bs->queue = screen->thread_queue;
       util_queue_add_job(&screen->flush_queue, bs, &bs->flush_completed,
                          submit_queue, post_submit, 0);
    } else {
-      bs->queue = screen->queue;
       submit_queue(bs, NULL, 0);
       post_submit(bs, NULL, 0);
    }