diff --git a/sha1_file.c b/sha1_file.c
index 472ccb2ff96d4bcf57cba4832dc2ca7631b309eb..46b25edcb303d3868d2de7f1db47fc10e97fe1e0 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2269,11 +2269,11 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
 	void *base, unsigned long base_size, enum object_type type)
 {
 	struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent));
-	struct list_head *lru;
+	struct list_head *lru, *tmp;
 
 	delta_base_cached += base_size;
 
-	list_for_each(lru, &delta_base_cache_lru) {
+	list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
 		struct delta_base_cache_entry *f =
 			list_entry(lru, struct delta_base_cache_entry, lru);
 		if (delta_base_cached <= delta_base_cache_limit)