diff --git a/src/base.c b/src/base.c
index 9d4ce5c5..44878ad4 100644
--- a/src/base.c
+++ b/src/base.c
@@ -476,7 +476,6 @@ base_alloc_edata(tsdn_t *tsdn, base_t *base) {
 	if (edata == NULL) {
 		return NULL;
 	}
-	edata_arena_ind_set(edata, ehooks_ind_get(&base->ehooks));
 	edata_esn_set(edata, esn);
 	return edata;
 }
diff --git a/src/hpa.c b/src/hpa.c
index 7d4fa1bf..a234e6c5 100644
--- a/src/hpa.c
+++ b/src/hpa.c
@@ -454,7 +454,6 @@ hpa_try_alloc_one_no_grow(tsdn_t *tsdn, hpa_shard_t *shard, size_t size,
 		*oom = true;
 		return NULL;
 	}
-	assert(edata_arena_ind_get(edata) == shard->ind);
 
 	hpdata_t *ps = psset_pick_alloc(&shard->psset, size);
 	if (ps == NULL) {