diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index b7f46bf57ec..66348363f37 100644
--- a/src/intel/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
@@ -1266,13 +1266,16 @@ anv_cmd_buffer_push_descriptor_set(struct anv_cmd_buffer *cmd_buffer,
          .offset = set->desc_mem.offset,
       };
 
+      enum isl_format format =
+         anv_isl_format_for_descriptor_type(cmd_buffer->device,
+                                            VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+
       const struct isl_device *isl_dev = &cmd_buffer->device->isl_dev;
       set->desc_surface_state =
          anv_state_stream_alloc(&cmd_buffer->surface_state_stream,
                                 isl_dev->ss.size, isl_dev->ss.align);
       anv_fill_buffer_surface_state(cmd_buffer->device,
-                                    set->desc_surface_state,
-                                    ISL_FORMAT_R32G32B32A32_FLOAT,
+                                    set->desc_surface_state, format,
                                     addr, layout->descriptor_buffer_size, 1);
    }
 
diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index d9a31f6be71..480f7272d75 100644
--- a/src/intel/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
@@ -956,9 +956,12 @@ anv_descriptor_set_create(struct anv_device *device,
       set->desc_mem.alloc_size = set_buffer_size;
       set->desc_mem.map = pool->bo->map + set->desc_mem.offset;
 
+      enum isl_format format =
+         anv_isl_format_for_descriptor_type(device,
+                                            VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+
       set->desc_surface_state = anv_descriptor_pool_alloc_state(pool);
-      anv_fill_buffer_surface_state(device, set->desc_surface_state,
-                                    ISL_FORMAT_R32G32B32A32_FLOAT,
+      anv_fill_buffer_surface_state(device, set->desc_surface_state, format,
                                     (struct anv_address) {
                                        .bo = pool->bo,
                                        .offset = set->desc_mem.offset,