diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index b99afcba0c7..b48ac540161 100644
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/src/intel/vulkan/genX_blorp_exec.c
@@ -418,7 +418,10 @@ blorp_exec_on_render(struct blorp_batch *batch,
    }
 
    anv_cmd_dirty_mask_t dirty = ~(ANV_CMD_DIRTY_INDEX_BUFFER |
-                                  ANV_CMD_DIRTY_XFB_ENABLE);
+                                  ANV_CMD_DIRTY_XFB_ENABLE |
+                                  ANV_CMD_DIRTY_OCCLUSION_QUERY_ACTIVE |
+                                  ANV_CMD_DIRTY_FS_MSAA_FLAGS |
+                                  ANV_CMD_DIRTY_RESTART_INDEX);
 
    cmd_buffer->state.gfx.vb_dirty = ~0;
    cmd_buffer->state.gfx.dirty |= dirty;
diff --git a/src/intel/vulkan/genX_simple_shader.c b/src/intel/vulkan/genX_simple_shader.c
index b37b64ea0f7..5ef7abce3fb 100644
--- a/src/intel/vulkan/genX_simple_shader.c
+++ b/src/intel/vulkan/genX_simple_shader.c
@@ -358,7 +358,10 @@ genX(emit_simpler_shader_init_fragment)(struct anv_simple_shader *state)
 
    state->cmd_buffer->state.gfx.vb_dirty = BITFIELD_BIT(0);
    state->cmd_buffer->state.gfx.dirty |= ~(ANV_CMD_DIRTY_INDEX_BUFFER |
-                                           ANV_CMD_DIRTY_XFB_ENABLE);
+                                           ANV_CMD_DIRTY_XFB_ENABLE |
+                                           ANV_CMD_DIRTY_OCCLUSION_QUERY_ACTIVE |
+                                           ANV_CMD_DIRTY_FS_MSAA_FLAGS |
+                                           ANV_CMD_DIRTY_RESTART_INDEX);
    state->cmd_buffer->state.push_constants_dirty |= VK_SHADER_STAGE_FRAGMENT_BIT;
    state->cmd_buffer->state.gfx.push_constant_stages = VK_SHADER_STAGE_FRAGMENT_BIT;
 }