diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 94d17564197..872572612bd 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -505,6 +505,16 @@ radv_cmd_set_depth_test_enable(struct radv_cmd_buffer *cmd_buffer, bool depth_te
    state->dirty_dynamic |= RADV_DYNAMIC_DEPTH_TEST_ENABLE;
 }
 
+ALWAYS_INLINE static void
+radv_cmd_set_depth_write_enable(struct radv_cmd_buffer *cmd_buffer, bool depth_write_enable)
+{
+   struct radv_cmd_state *state = &cmd_buffer->state;
+
+   state->dynamic.vk.ds.depth.write_enable = depth_write_enable;
+
+   state->dirty_dynamic |= RADV_DYNAMIC_DEPTH_WRITE_ENABLE;
+}
+
 static void
 radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dynamic_state *src)
 {
@@ -822,7 +832,12 @@ radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dy
       }
    }
 
-   RADV_CMP_COPY(vk.ds.depth.write_enable, RADV_DYNAMIC_DEPTH_WRITE_ENABLE);
+   if (copy_mask & RADV_DYNAMIC_DEPTH_WRITE_ENABLE) {
+      if (dest->vk.ds.depth.write_enable != src->vk.ds.depth.write_enable) {
+         radv_cmd_set_depth_write_enable(cmd_buffer, src->vk.ds.depth.write_enable);
+      }
+   }
+
    RADV_CMP_COPY(vk.ds.depth.compare_op, RADV_DYNAMIC_DEPTH_COMPARE_OP);
    RADV_CMP_COPY(vk.ds.depth.bounds_test.enable, RADV_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE);
    RADV_CMP_COPY(vk.ds.stencil.test_enable, RADV_DYNAMIC_STENCIL_TEST_ENABLE);
@@ -8639,11 +8654,7 @@ VKAPI_ATTR void VKAPI_CALL
 radv_CmdSetDepthWriteEnable(VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable)
 {
    VK_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
-   struct radv_cmd_state *state = &cmd_buffer->state;
-
-   state->dynamic.vk.ds.depth.write_enable = depthWriteEnable;
-
-   state->dirty_dynamic |= RADV_DYNAMIC_DEPTH_WRITE_ENABLE;
+   radv_cmd_set_depth_write_enable(cmd_buffer, depthWriteEnable);
 }
 
 VKAPI_ATTR void VKAPI_CALL