diff --git a/.pick_status.json b/.pick_status.json
index 7a1357d684f..00fccf318f7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3494,7 +3494,7 @@
         "description": "svga: Check if Stencil buffer is NULL",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f29d93982420f26c25b78e65fad78b09dc71f187",
         "notes": null
diff --git a/src/gallium/drivers/svga/svga_state_framebuffer.c b/src/gallium/drivers/svga/svga_state_framebuffer.c
index 75e172629a8..e5ee4935d3b 100644
--- a/src/gallium/drivers/svga/svga_state_framebuffer.c
+++ b/src/gallium/drivers/svga/svga_state_framebuffer.c
@@ -84,7 +84,7 @@ emit_fb_vgpu9(struct svga_context *svga)
       if (svga_surface_needs_propagation(hwfb->zsbuf))
          svga_propagate_surface(svga, hwfb->zsbuf, true);
 
-      if (currfb->zsbuf->base.texture &&
+      if (currfb->zsbuf && currfb->zsbuf->base.texture &&
           util_format_is_depth_and_stencil(currfb->zsbuf->base.format)) {
          ret = SVGA3D_SetRenderTarget(svga->swc, SVGA3D_RT_STENCIL,
                                       currfb->zsbuf);