diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 93ef06fb268..ba1deee23ec 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -2742,7 +2742,8 @@ static void r300DrawBuffer( GLcontext *ctx, GLenum mode )
 	radeon_firevertices(&rmesa->radeon);	/* don't pipeline cliprect changes */
 
 	radeonSetCliprects( &rmesa->radeon );
-	radeonUpdatePageFlipping(&rmesa->radeon);
+        if (!rmesa->radeon.radeonScreen->driScreen->dri2.enabled) 
+		radeonUpdatePageFlipping(&rmesa->radeon);
 }
 
 static void r300ReadBuffer( GLcontext *ctx, GLenum mode )