diff --git a/src/gallium/state_trackers/nine/nine_pipe.c b/src/gallium/state_trackers/nine/nine_pipe.c
index b69ddb67113..dd858aef743 100644
--- a/src/gallium/state_trackers/nine/nine_pipe.c
+++ b/src/gallium/state_trackers/nine/nine_pipe.c
@@ -286,10 +286,10 @@ const enum pipe_format nine_d3d9_to_pipe_format_map[120] =
    [D3DFMT_A2W10V10U10]   = PIPE_FORMAT_R10SG10SB10SA2U_NORM,
    [D3DFMT_D16_LOCKABLE]  = PIPE_FORMAT_Z16_UNORM,
    [D3DFMT_D32]           = PIPE_FORMAT_Z32_UNORM,
-   [D3DFMT_D15S1]         = PIPE_FORMAT_Z24_UNORM_S8_UINT,
+   [D3DFMT_D15S1]         = PIPE_FORMAT_NONE,
    [D3DFMT_D24S8]         = PIPE_FORMAT_S8_UINT_Z24_UNORM,
    [D3DFMT_D24X8]         = PIPE_FORMAT_X8Z24_UNORM,
-   [D3DFMT_D24X4S4]       = PIPE_FORMAT_Z24_UNORM_S8_UINT,
+   [D3DFMT_D24X4S4]       = PIPE_FORMAT_NONE,
    [D3DFMT_D16]           = PIPE_FORMAT_Z16_UNORM,
    [D3DFMT_D32F_LOCKABLE] = PIPE_FORMAT_Z32_FLOAT,
    [D3DFMT_D24FS8]        = PIPE_FORMAT_Z32_FLOAT_S8X24_UINT,