diff --git a/icd/intel/layout.c b/icd/intel/layout.c
index 1f18a11..be40789 100644
--- a/icd/intel/layout.c
+++ b/icd/intel/layout.c
@@ -699,7 +699,7 @@
    switch (format) {
    case VK_FORMAT_D24_UNORM_S8_UINT:
       if (require_separate_stencil) {
-         format = VK_FORMAT_D24_UNORM;
+         format = VK_FORMAT_D24_UNORM_X8;
          layout->separate_stencil = true;
       }
       break;