diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 30f363390d4..51f4c8bc865 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1607,7 +1607,6 @@ _mesa_make_current( struct gl_context *newCtx,
    }
 
    if (curCtx &&
-       (curCtx->WinSysDrawBuffer || curCtx->WinSysReadBuffer) &&
        /* make sure this context is valid for flushing */
        curCtx != newCtx &&
        curCtx->Const.ContextReleaseBehavior ==