diff --git a/.pick_status.json b/.pick_status.json
index b9e1e7ddf62..73f2ba68b1d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3901,7 +3901,7 @@
         "description": "zink: disable have_EXT_vertex_input_dynamic_state without EDS2",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index bf65503df78..0fd8341d1c7 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -2391,6 +2391,9 @@ init_driver_workarounds(struct zink_screen *screen)
    default:
       break;
    }
+   /* EXT_vertex_input_dynamic_state is only used with EDS2 and above */
+   if (!screen->info.have_EXT_extended_dynamic_state2)
+      screen->info.have_EXT_vertex_input_dynamic_state = false;
    if (screen->info.line_rast_feats.stippledRectangularLines &&
        screen->info.line_rast_feats.stippledBresenhamLines &&
        screen->info.line_rast_feats.stippledSmoothLines &&