diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index fbac508b32e..b6776a1acee 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -416,7 +416,8 @@ _mesa_RenderMode( GLenum mode )
    if (MESA_VERBOSE & VERBOSE_API)
       _mesa_debug(ctx, "glRenderMode %s\n", _mesa_enum_to_string(mode));
 
-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE, 0);
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE | _NEW_FF_VERT_PROGRAM |
+                  _NEW_FF_FRAG_PROGRAM, 0);
 
    switch (ctx->RenderMode) {
       case GL_RENDER:
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 4b2b3ae6950..389db5f0f71 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -487,9 +487,8 @@ _mesa_update_state_locked( struct gl_context *ctx )
       GLbitfield prog_flags = _NEW_PROGRAM;
 
       if (ctx->FragmentProgram._UsesTexEnvProgram) {
-         prog_flags |= _NEW_BUFFERS | _NEW_TEXTURE_OBJECT |
-                       _NEW_FF_FRAG_PROGRAM | _NEW_RENDERMODE |
-                       _NEW_COLOR | _NEW_TEXTURE_STATE;
+         prog_flags |= _NEW_BUFFERS | _NEW_TEXTURE_OBJECT | _NEW_COLOR |
+                       _NEW_FF_FRAG_PROGRAM | _NEW_TEXTURE_STATE;
       }
 
       if (ctx->VertexProgram._UsesTnlProgram)