diff --git a/src/util/hash_table.c b/src/util/hash_table.c
index c7c8acf31a1..b0e7506ab8e 100644
--- a/src/util/hash_table.c
+++ b/src/util/hash_table.c
@@ -812,6 +812,8 @@ _mesa_hash_table_u64_clear(struct hash_table_u64 *ht)
       return;
 
    _mesa_hash_table_clear(ht->table, _mesa_hash_table_u64_delete_key);
+   ht->freed_key_data = NULL;
+   ht->deleted_key_data = NULL;
 }
 
 void