diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index 2d306f94cc5..4bebea6537b 100644
--- a/src/intel/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
@@ -132,6 +132,7 @@ anv_create_cmd_buffer(struct vk_command_pool *pool,
 
    cmd_buffer->self_mod_locations = NULL;
 
+   cmd_buffer->generation_jump_addr = ANV_NULL_ADDRESS;
    cmd_buffer->generation_return_addr = ANV_NULL_ADDRESS;
 
    anv_cmd_state_init(cmd_buffer);
@@ -198,6 +199,9 @@ anv_cmd_buffer_reset(struct vk_command_buffer *vk_cmd_buffer,
    anv_cmd_buffer_reset_batch_bo_chain(cmd_buffer);
    anv_cmd_state_reset(cmd_buffer);
 
+   cmd_buffer->generation_jump_addr = ANV_NULL_ADDRESS;
+   cmd_buffer->generation_return_addr = ANV_NULL_ADDRESS;
+
    anv_state_stream_finish(&cmd_buffer->surface_state_stream);
    anv_state_stream_init(&cmd_buffer->surface_state_stream,
                          &cmd_buffer->device->internal_surface_state_pool, 4096);