diff --git a/src/gallium/drivers/nouveau/nv50/nv50_vbo.c b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c
index 1baa0c3..1d03f42 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c
@@ -317,7 +317,6 @@ nv50_vertex_arrays_validate(struct nv50_context *nv50)
          if (buf && buf->status & NOUVEAU_BUFFER_STATUS_GPU_WRITING) {
             buf->status &= ~NOUVEAU_BUFFER_STATUS_GPU_WRITING;
             nv50->base.vbo_dirty = TRUE;
-            break;
          }
       }
    }
@@ -621,8 +620,9 @@ nv50_draw_elements(struct nv50_context *nv50, boolean shorten,
        * the not-yet-written data. Ideally this wait would only happen on
        * pushbuf submit, but it's probably not a big performance difference.
        */
-      if (buf->fence_wr && !nouveau_fence_signalled(buf->fence_wr))
-         nouveau_fence_wait(buf->fence_wr);
+      //if (buf->fence_wr && !nouveau_fence_signalled(buf->fence_wr))
+      //   nouveau_fence_wait(buf->fence_wr);
+      nouveau_bo_wait(buf->bo, NOUVEAU_BO_RD, nv50->screen->base.client);
 
       while (instance_count--) {
          BEGIN_NV04(push, NV50_3D(VERTEX_BEGIN_GL), 1);