diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 1884932bbc7..92eeb5b8c54 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -1552,7 +1552,9 @@ VkResult anv_AllocateMemory(
    /* TODO: Disabling compression on external bos will cause problems once we
     * have a modifier that supports compression (Xe2+).
     */
-   if (!(alloc_flags & ANV_BO_ALLOC_EXTERNAL) && mem_type->compressed)
+   if (!(alloc_flags & ANV_BO_ALLOC_EXTERNAL) &&
+       mem_type->compressed &&
+       !INTEL_DEBUG(DEBUG_NO_CCS))
       alloc_flags |= ANV_BO_ALLOC_COMPRESSED;
 
    if (mem_type->dynamic_visible)
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index d2ed28605a7..c8313e3b8e8 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -2144,9 +2144,6 @@ resolve_anb_image(struct anv_device *device,
 static bool
 anv_image_is_pat_compressible(struct anv_device *device, struct anv_image *image)
 {
-   if (INTEL_DEBUG(DEBUG_NO_CCS))
-      return false;
-
    if (device->info->ver < 20)
       return false;
 
diff --git a/src/intel/vulkan/xe/anv_device.c b/src/intel/vulkan/xe/anv_device.c
index 2b32c9639f1..6ce971355ee 100644
--- a/src/intel/vulkan/xe/anv_device.c
+++ b/src/intel/vulkan/xe/anv_device.c
@@ -99,7 +99,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 && !INTEL_DEBUG(DEBUG_NO_CCS)) {
+      if (device->info.ver >= 20) {
          device->memory.types[device->memory.type_count++] = (struct anv_memory_type) {
             .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
             .heapIndex = 0,
@@ -149,13 +149,11 @@ anv_xe_physical_device_init_memory_types(struct anv_physical_device *device)
          .heapIndex = 0,
       };
    } else {
-      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,
-            .compressed = true,
-         };
-      }
+      device->memory.types[device->memory.type_count++] = (struct anv_memory_type) {
+         .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+         .heapIndex = 0,
+         .compressed = true,
+      };
       device->memory.types[device->memory.type_count++] = (struct anv_memory_type) {
          .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
                           VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |