diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 3f3ed05b3b0c7d8dd43921a9d207b0f221d4df52..2830a038c88720e7dde28893ea698218f1d3fb73 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -2220,8 +2220,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list
 
     descriptor = d3d12_desc_from_gpu_handle(base_descriptor);
 
-    d3d12_command_list_prepare_descriptors(list, bind_point);
-
     descriptor_count = 0;
     current_descriptor_write = descriptor_writes;
     current_image_info = image_infos;
@@ -2329,6 +2327,9 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis
     if (!rs || !rs->pool_size_count || !rs->vk_set_layout)
         return;
 
+    if (bindings->descriptor_table_dirty_mask)
+        d3d12_command_list_prepare_descriptors(list, bind_point);
+
     for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i)
     {
         if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i))