diff --git a/include/mimalloc-track.h b/include/mimalloc-track.h
index 8326c620..b2404f8d 100644
--- a/include/mimalloc-track.h
+++ b/include/mimalloc-track.h
@@ -24,8 +24,9 @@ uses the block start pointer and original size (corresponding to the `mi_track_m
 
 #if MI_VALGRIND
 
-#define MI_TRACK_ENABLED 1
-#define MI_TRACK_TOOL    "valgrind"
+#define MI_TRACK_ENABLED      1
+#define MI_TRACK_HEAP_DESTROY 1           // track free of individual blocks on heap_destroy
+#define MI_TRACK_TOOL         "valgrind"
 
 #include <valgrind/valgrind.h>
 #include <valgrind/memcheck.h>
@@ -39,8 +40,9 @@ uses the block start pointer and original size (corresponding to the `mi_track_m
 
 #elif MI_ASAN
 
-#define MI_TRACK_ENABLED 1
-#define MI_TRACK_TOOL    "asan"
+#define MI_TRACK_ENABLED      1
+#define MI_TRACK_HEAP_DESTROY 0
+#define MI_TRACK_TOOL         "asan"
 
 #include <sanitizer/asan_interface.h>
 
@@ -52,8 +54,9 @@ uses the block start pointer and original size (corresponding to the `mi_track_m
 
 #else
 
-#define MI_TRACK_ENABLED 0
-#define MI_TRACK_TOOL    "none"
+#define MI_TRACK_ENABLED      0
+#define MI_TRACK_HEAP_DESTROY 0 
+#define MI_TRACK_TOOL         "none"
 
 #define mi_track_malloc_size(p,reqsize,size,zero)
 #define mi_track_free_size(p,_size)
diff --git a/src/heap.c b/src/heap.c
index 0ed0ab2c..6fe1fb17 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -8,6 +8,7 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "mimalloc.h"
 #include "mimalloc-internal.h"
 #include "mimalloc-atomic.h"
+#include "mimalloc-track.h"
 
 #include <string.h>  // memset, memcpy
 
@@ -310,6 +311,12 @@ void _mi_heap_destroy_pages(mi_heap_t* heap) {
   mi_heap_reset_pages(heap);
 }
 
+static bool mi_cdecl mi_heap_track_block_free(const mi_heap_t* heap, const mi_heap_area_t* area, void* block, size_t block_size, void* arg) {
+  MI_UNUSED(heap); MI_UNUSED(area);  MI_UNUSED(arg); MI_UNUSED(block_size);
+  mi_track_free_size(block,mi_usable_size(block));
+  return true;
+}
+
 void mi_heap_destroy(mi_heap_t* heap) {
   mi_assert(heap != NULL);
   mi_assert(mi_heap_is_initialized(heap));
@@ -321,6 +328,10 @@ void mi_heap_destroy(mi_heap_t* heap) {
     mi_heap_delete(heap);
   }
   else {
+    // track all blocks as freed
+    #if MI_TRACK_HEAP_DESTROY
+    mi_heap_visit_blocks(heap, true, mi_heap_track_block_free, NULL);
+    #endif
     // free all pages
     _mi_heap_destroy_pages(heap);
     mi_heap_free(heap);