diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index 4fe75792c7c..cbff53bc235 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -884,6 +884,7 @@ transform_feedback_varyings(struct gl_context *ctx,
 
    if (!shProg->TransformFeedback.VaryingNames) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTransformFeedbackVaryings()");
+      shProg->TransformFeedback.NumVarying = 0;
       return;
    }