diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.c b/src/mesa/drivers/dri/i915/intel_batchbuffer.c
index 87969900b3d..3b0ba752f76 100644
--- a/src/mesa/drivers/dri/i915/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.c
@@ -216,10 +216,6 @@ do_flush_locked(struct intel_batchbuffer *batch,
     */
 
    driBOFence(batch->buffer, fo);
-   for (i = 0; i < batch->nr_relocs; i++) {
-      struct buffer_reloc *r = &batch->reloc[i];
-      driBOFence(r->buf, batch->last_fence);
-   }
 
    if (driFenceType(fo) == DRM_FENCE_TYPE_EXE) {
 
@@ -232,6 +228,10 @@ do_flush_locked(struct intel_batchbuffer *batch,
    } else {
       driFenceUnReference(batch->last_fence);
       batch->last_fence = fo;
+      for (i = 0; i < batch->nr_relocs; i++) {
+	struct buffer_reloc *r = &batch->reloc[i];
+	driBOFence(r->buf, fo);
+      }
    }
 
    if (intel->numClipRects == 0 && !ignore_cliprects) {