diff --git a/src/intel/vulkan_hasvk/anv_cmd_buffer.c b/src/intel/vulkan_hasvk/anv_cmd_buffer.c
index d78493f6350..c49ebceb4f1 100644
--- a/src/intel/vulkan_hasvk/anv_cmd_buffer.c
+++ b/src/intel/vulkan_hasvk/anv_cmd_buffer.c
@@ -298,6 +298,11 @@ void anv_CmdBindPipeline(
    case VK_PIPELINE_BIND_POINT_GRAPHICS: {
       struct anv_graphics_pipeline *gfx_pipeline =
          anv_pipeline_to_graphics(pipeline);
+
+      /* Apply the non dynamic state from the pipeline */
+      vk_cmd_set_dynamic_graphics_state(&cmd_buffer->vk,
+                                        &gfx_pipeline->dynamic_state);
+
       if (cmd_buffer->state.gfx.pipeline == gfx_pipeline)
          return;
 
@@ -309,10 +314,6 @@ void anv_CmdBindPipeline(
          set_dirty_for_bind_map(cmd_buffer, stage,
                                 &gfx_pipeline->shaders[stage]->bind_map);
       }
-
-      /* Apply the non dynamic state from the pipeline */
-      vk_cmd_set_dynamic_graphics_state(&cmd_buffer->vk,
-                                        &gfx_pipeline->dynamic_state);
       break;
    }