diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 6f79d8f46e1..b8118213554 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -558,13 +558,13 @@ driswSwapBuffers(__GLXDRIdrawable * pdraw,
    (void) divisor;
    (void) remainder;
 
+   if (psc->kopper)
+       return kopperSwapBuffers(pdraw->dri_drawable, flush ? __DRI2_FLUSH_CONTEXT : 0);
+
    if (flush) {
       CALL_Flush(GET_DISPATCH(), ());
    }
 
-   if (psc->kopper)
-       return kopperSwapBuffers(pdraw->dri_drawable, flush ? __DRI2_FLUSH_CONTEXT : 0);
-
    driSwapBuffers(pdraw->dri_drawable);
 
    return 0;