diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index bab5808cdd2..577a0fe9f4e 100644
--- a/src/intel/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
@@ -2702,8 +2702,9 @@ void anv_UpdateDescriptorSets(
           *    - RENDER_SURFACE_STATE
           *    - SAMPLER_STATE
           */
-         assert((dst->desc_surface_mem.map == NULL) == (src->desc_surface_mem.map == NULL));
-         if (dst->desc_surface_mem.map) {
+         if (copy_surface_element_size > 0) {
+            assert(dst->desc_surface_mem.map != NULL);
+            assert(src->desc_surface_mem.map != NULL);
             memcpy(dst->desc_surface_mem.map +
                    dst_layout->descriptor_surface_offset +
                    (copy->dstArrayElement + j) * dst_layout->descriptor_surface_stride,
@@ -2713,8 +2714,9 @@ void anv_UpdateDescriptorSets(
                    copy_surface_element_size);
          }
 
-         assert((dst->desc_sampler_mem.map == NULL) == (src->desc_sampler_mem.map == NULL));
-         if (dst->desc_sampler_mem.map) {
+         if (copy_sampler_element_size) {
+            assert(dst->desc_sampler_mem.map != NULL);
+            assert(src->desc_sampler_mem.map != NULL);
             memcpy(dst->desc_sampler_mem.map +
                    dst_layout->descriptor_sampler_offset +
                    (copy->dstArrayElement + j) * dst_layout->descriptor_sampler_stride,