diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index d83fab6954f..b94a6d272d2 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1772,7 +1772,9 @@ _mesa_flush(struct gl_context *ctx)
 {
    FLUSH_VERTICES(ctx, 0, 0);
    if (ctx->Driver.Flush) {
-      ctx->Driver.Flush(ctx, 0);
+      bool async = !ctx->Shared->HasExternallySharedImages;
+
+      ctx->Driver.Flush(ctx, async ? PIPE_FLUSH_ASYNC : 0);
    }
 }