diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 12bee1a..4de95f1 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -354,7 +354,6 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
 	ctx->Const.FragmentProgram.MaxNativeTexIndirections =
 	    PFS_MAX_TEX_INDIRECT;
 	ctx->Const.FragmentProgram.MaxNativeAddressRegs = 0;	/* and these are?? */
-	ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
 	ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
 
 	driInitExtensions(ctx, card_extensions, GL_TRUE);
@@ -401,7 +400,8 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
 		}
 		TCL_FALLBACK(r300->radeon.glCtx,
 			     RADEON_TCL_FALLBACK_TCL_DISABLE, 1);
-	}
+	} else
+	ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
 
 	return GL_TRUE;
 }