diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b40e41774dd..bfd511a364d 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -711,7 +711,6 @@ init_attrib_groups(struct gl_context *ctx)
    ctx->NewDriverState = ST_ALL_STATES_MASK;
    ctx->ErrorValue = GL_NO_ERROR;
    ctx->ShareGroupReset = false;
-   ctx->VertexProgram._VaryingInputs = VERT_BIT_ALL;
    ctx->IntelBlackholeRender = debug_get_bool_option("INTEL_BLACKHOLE_DEFAULT", false);
 
    return GL_TRUE;
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index bf1db64c327..9fee9f050a7 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -89,6 +89,7 @@ _mesa_init_program(struct gl_context *ctx)
    ctx->Program.ErrorPos = -1;
    ctx->Program.ErrorString = strdup("");
 
+   ctx->VertexProgram._VaryingInputs = VERT_BIT_ALL;
    ctx->VertexProgram.Enabled = GL_FALSE;
    ctx->VertexProgram.PointSizeEnabled =
       (ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE;