diff --git a/.pick_status.json b/.pick_status.json
index 508c2621a35..617f62ba083 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -238,7 +238,7 @@
         "description": "util/hash_table: Clear special 0/1 entries for u64 hash table too",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e532a47f76cc8d763e2534c61b27dce0f5bc86a0"
     },
diff --git a/src/util/hash_table.c b/src/util/hash_table.c
index 1811ee7432f..9be605d4312 100644
--- a/src/util/hash_table.c
+++ b/src/util/hash_table.c
@@ -807,6 +807,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