diff --git a/src/xenia/cpu/processor.cc b/src/xenia/cpu/processor.cc
index 944dd598f..ce625879d 100644
--- a/src/xenia/cpu/processor.cc
+++ b/src/xenia/cpu/processor.cc
@@ -528,9 +528,7 @@ void Processor::OnThreadDestroyed(uint32_t thread_id) {
   auto global_lock = global_critical_region_.Acquire();
   auto it = thread_debug_infos_.find(thread_id);
   assert_true(it != thread_debug_infos_.end());
-  auto thread_info = it->second.get();
-  thread_info->state = ThreadDebugInfo::State::kZombie;
-  thread_info->thread = nullptr;
+  thread_debug_infos_.erase(it);
 }
 
 void Processor::OnThreadEnteringWait(uint32_t thread_id) {