diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index 3c9c6d3e043..e2a2eebff2c 100644
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -2353,6 +2353,9 @@ VkResult anv_CreateCommandBuffer(
    cmd_buffer->dirty = 0;
    cmd_buffer->vb_dirty = 0;
    cmd_buffer->pipeline = NULL;
+   cmd_buffer->vp_state = NULL;
+   cmd_buffer->rs_state = NULL;
+   cmd_buffer->ds_state = NULL;
 
    *pCmdBuffer = (VkCmdBuffer) cmd_buffer;