Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision ca0c311012ec648cff08394473a39dae0292ec46)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision e7a8f655ee2736d3b5a902f42b4cba2d05067676)
@@ -487,4 +487,7 @@
 	last = 0p;
 	cancellation = 0p;
+    ehm_state.ehm_buffer{};
+    ehm_state.buffer_lock{};
+    ehm_state.ehm_enabled = false;
 }