diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 068dac8d714..5d3d0266e91 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -96,7 +96,8 @@ radv_use_tc_compat_htile_for_image(struct radv_device *device,
 	/* FIXME: for some reason TC compat with 2/4/8 samples breaks some cts
 	 * tests - disable for now.
 	 */
-	if (pCreateInfo->samples >= 2 && format == VK_FORMAT_D32_SFLOAT_S8_UINT)
+	if (device->physical_device->rad_info.chip_class < GFX9 &&
+	    pCreateInfo->samples >= 2 && format == VK_FORMAT_D32_SFLOAT_S8_UINT)
 		return false;
 
 	/* GFX9 supports both 32-bit and 16-bit depth surfaces, while GFX8 only