diff --git a/src/page.c b/src/page.c
index 40aec0c6..02f10238 100644
--- a/src/page.c
+++ b/src/page.c
@@ -229,16 +229,12 @@ void _mi_page_free_collect(mi_page_t* page, bool force) {
 // called from segments when reclaiming abandoned pages
 void _mi_page_reclaim(mi_heap_t* heap, mi_page_t* page) {
   mi_assert_expensive(mi_page_is_valid_init(page));
-  mi_assert_internal(mi_page_heap(page) == NULL);
+  mi_assert_internal(mi_page_heap(page) == heap);
+  mi_assert_internal(mi_page_thread_free_flag(page) != MI_NEVER_DELAYED_FREE);
   mi_assert_internal(_mi_page_segment(page)->page_kind != MI_PAGE_HUGE);
   mi_assert_internal(!page->is_reset);
-  mi_assert_internal(mi_page_thread_free_flag(page) == MI_NEVER_DELAYED_FREE);
-  mi_page_set_heap(page, heap);
   mi_page_queue_t* pq = mi_page_queue(heap, mi_page_block_size(page));
-  mi_page_queue_push(heap, pq, page);
-  _mi_page_use_delayed_free(page, MI_USE_DELAYED_FREE, true); // override never (after heap is set)
-  // _mi_page_free_collect(page,false); // no need, as it is just done before reclaim
-  mi_assert_internal(mi_page_heap(page)!= NULL);  
+  mi_page_queue_push(heap, pq, page);    
   mi_assert_expensive(_mi_page_is_valid(page));
 }
 
diff --git a/src/segment.c b/src/segment.c
index 4fb3e28b..d27a7c13 100644
--- a/src/segment.c
+++ b/src/segment.c
@@ -772,13 +772,16 @@ bool _mi_segment_try_reclaim_abandoned( mi_heap_t* heap, bool try_all, mi_segmen
         segment->abandoned--;
         mi_assert(page->next == NULL);
         _mi_stat_decrease(&tld->stats->pages_abandoned, 1);
+        // set the heap again and allow delayed free again
+        mi_page_set_heap(page, heap);
+        _mi_page_use_delayed_free(page, MI_USE_DELAYED_FREE, true); // override never (after heap is set)
         _mi_page_free_collect(page, false); // ensure used count is up to date
         if (mi_page_all_free(page)) {
-          // if everything free by now, free the page
+          // if everything free already, clear the page directly
           mi_segment_page_clear(segment,page,tld);
         }
         else {
-          // otherwise reclaim it
+          // otherwise reclaim it into the heap
           _mi_page_reclaim(heap,page);
         }
       }