diff --git a/src/init.c b/src/init.c
index 8a48ae5e..ee4fd377 100644
--- a/src/init.c
+++ b/src/init.c
@@ -535,14 +535,13 @@ void _mi_heap_set_default_direct(mi_heap_t* heap)  {
   #elif defined(MI_TLS_PTHREAD_SLOT_OFS)
   *mi_prim_tls_pthread_heap_slot() = heap;
   #elif defined(MI_TLS_PTHREAD)
+  _mi_prim_thread_associate_default_heap(heap);
   // we use _mi_heap_default_key
   #else
   _mi_heap_default = heap;
   #endif
 
-  // ensure the default heap is passed to `_mi_thread_done`
-  // setting to a non-NULL value also ensures `mi_thread_done` is called.
-  _mi_prim_thread_associate_default_heap(heap);
+
 }
 
 void mi_thread_set_in_threadpool(void) mi_attr_noexcept {