diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 7787c1a87af..4e1a502a51b 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -643,10 +643,10 @@ intel_miptree_all_slices_resolve(struct intel_context *intel,
    struct intel_resolve_map *i, *next;
 
    for (i = mt->hiz_map.next; i; i = next) {
+      next = i->next;
       if (i->need != need)
 	 continue;
       func(intel, mt, i->level, i->layer);
-      next = i->next;
       intel_resolve_map_remove(i);
       did_resolve = true;
    }