diff --git a/.pick_status.json b/.pick_status.json
index 68b4b11395a..45c4a9207ea 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -7184,7 +7184,7 @@
         "description": "Revert \"zink: always force flushes when originating from api frontend\"",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "03f049f49730b8b1268f2975fc34ac2b1f9a4ef9",
         "notes": null
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 63eb340e7b3..0a8c44e837b 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -3863,8 +3863,7 @@ zink_flush(struct pipe_context *pctx,
       }
    }
 
-   /* TODO: if swapchains gain timeline semaphore semantics, `flags` can be eliminated and no-op fence can return timeline id */
-   if (!batch->has_work && flags) {
+   if (!batch->has_work) {
        if (pfence) {
           /* reuse last fence */
           fence = ctx->last_fence;