diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c
index 697bf491a01..774c5648113 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c
@@ -315,14 +315,14 @@ nvc0_tfb_validate(struct nvc0_context *nvc0)
       struct nvc0_so_target *targ = nvc0_so_target(nvc0->tfbbuf[b]);
       struct nv04_resource *buf;
 
-      if (!targ) {
+      if (targ && tfb)
+         targ->stride = tfb->stride[b];
+
+      if (!targ || !targ->stride) {
          IMMED_NVC0(push, NVC0_3D(TFB_BUFFER_ENABLE(b)), 0);
          continue;
       }
 
-      if (tfb)
-         targ->stride = tfb->stride[b];
-
       buf = nv04_resource(targ->pipe.buffer);
 
       BCTX_REFN(nvc0->bufctx_3d, 3D_TFB, buf, WR);