diff --git a/src/client/windows/crash_generation/crash_generation_server.cc b/src/client/windows/crash_generation/crash_generation_server.cc
index 61af1b2d..b180b2c2 100644
--- a/src/client/windows/crash_generation/crash_generation_server.cc
+++ b/src/client/windows/crash_generation/crash_generation_server.cc
@@ -793,6 +793,7 @@ void CALLBACK CrashGenerationServer::OnClientEnd(void* context, BOOLEAN) {
   CrashGenerationServer* crash_server = client_info->crash_server();
   assert(crash_server);
 
+  client_info->UnregisterWaits();
   InterlockedIncrement(&crash_server->cleanup_item_count_);
 
   if (!QueueUserWorkItem(CleanupClient, context, WT_EXECUTEDEFAULT)) {