diff --git a/.pick_status.json b/.pick_status.json
index 2ec52e3b7b3..8778d81d480 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2214,7 +2214,7 @@
         "description": "anv: fixup null address check",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/intel/vulkan/genX_cmd_draw_helpers.h b/src/intel/vulkan/genX_cmd_draw_helpers.h
index ced93b498c4..ea1a6daf47f 100644
--- a/src/intel/vulkan/genX_cmd_draw_helpers.h
+++ b/src/intel/vulkan/genX_cmd_draw_helpers.h
@@ -60,7 +60,9 @@ static void
 emit_base_vertex_instance_bo(struct anv_cmd_buffer *cmd_buffer,
                              struct anv_address addr)
 {
-   emit_vertex_bo(cmd_buffer, addr, addr.bo ? 8 : 0, ANV_SVGS_VB_INDEX);
+   emit_vertex_bo(cmd_buffer, addr,
+                  anv_address_is_null(addr) ? 0 : 8,
+                  ANV_SVGS_VB_INDEX);
 }
 
 static void