diff --git a/.pick_status.json b/.pick_status.json
index 57a174d8aae..ed21bdccfc9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -764,7 +764,7 @@
         "description": "anv: don't expose the compressed memory types when DEBUG_NO_CCS",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/intel/vulkan/xe/anv_device.c b/src/intel/vulkan/xe/anv_device.c
index 379567cd9f1..df6173a283a 100644
--- a/src/intel/vulkan/xe/anv_device.c
+++ b/src/intel/vulkan/xe/anv_device.c
@@ -98,7 +98,7 @@ VkResult
 anv_xe_physical_device_init_memory_types(struct anv_physical_device *device)
 {
    if (anv_physical_device_has_vram(device)) {
-      if (device->info.ver >= 20) {
+      if (device->info.ver >= 20 && !INTEL_DEBUG(DEBUG_NO_CCS)) {
          device->memory.types[device->memory.type_count++] = (struct anv_memory_type) {
             .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
             .heapIndex = 0,
@@ -148,7 +148,7 @@ anv_xe_physical_device_init_memory_types(struct anv_physical_device *device)
          .heapIndex = 0,
       };
    } else {
-      if (device->info.ver >= 20) {
+      if (device->info.ver >= 20 && !INTEL_DEBUG(DEBUG_NO_CCS)) {
          device->memory.types[device->memory.type_count++] = (struct anv_memory_type) {
             .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
             .heapIndex = 0,