diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index b4dd00fa631..9ca620a22f1 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -5081,16 +5081,8 @@ radv_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pi
       unsigned set_idx = i + firstSet;
       RADV_FROM_HANDLE(radv_descriptor_set, set, pDescriptorSets[i]);
 
-      if (!set) {
-         /* From the Vulkan spec 1.3.211:
-          *
-          * "VUID-vkCmdBindDescriptorSets-layout-06564
-          *  If layout was not created with VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT, each
-          *  element of pDescriptorSets must be a valid VkDescriptorSet"
-          */
-         assert(layout->independent_sets);
+      if (!set)
          continue;
-      }
 
       /* If the set is already bound we only need to update the
        * (potentially changed) dynamic offsets. */
diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index b74fd40b9e5..26f0a2f108d 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -564,14 +564,8 @@ radv_CreatePipelineLayout(VkDevice _device, const VkPipelineLayoutCreateInfo *pC
    for (uint32_t set = 0; set < pCreateInfo->setLayoutCount; set++) {
       RADV_FROM_HANDLE(radv_descriptor_set_layout, set_layout, pCreateInfo->pSetLayouts[set]);
 
-      /* From the Vulkan spec 1.3.211:
-       *
-       * "VUID-VkPipelineLayoutCreateInfo-flags-06562
-       *  If flags: does not include VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT, elements of
-       *  pSetLayouts must be valid VkDescriptorSetLayout objects"
-       */
       if (set_layout == NULL) {
-         assert(layout->independent_sets);
+         layout->set[set].layout = NULL;
          continue;
       }