diff --git a/src/xenia/kernel/util/object_table.cc b/src/xenia/kernel/util/object_table.cc
index df881e3a1..d1250791c 100644
--- a/src/xenia/kernel/util/object_table.cc
+++ b/src/xenia/kernel/util/object_table.cc
@@ -205,6 +205,10 @@ X_STATUS ObjectTable::RemoveHandle(X_HANDLE handle) {
 
     XELOGI("Removed handle:{:08X} for {}", handle, typeid(*object).name());
 
+    // Remove object name from mapping to prevent naming collision.
+    if (!object->name().empty()) {
+      RemoveNameMapping(object->name());
+    }
     // Release now that the object has been removed from the table.
     object->Release();
   }