1 files changed, 5 insertions, 2 deletions

diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 7470a97ca..b0c3f4ae1 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -6,6 +6,7 @@
 #include "core/hle/kernel/handle_table.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/memory.h"
+#include "core/hle/kernel/object_address_table.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/kernel/thread.h"
@@ -35,7 +36,9 @@ void Init(u32 system_mode) {
 
 /// Shutdown the kernel
 void Shutdown() {
-    g_handle_table.Clear(); // Free all kernel objects
+    // Free all kernel objects
+    g_handle_table.Clear();
+    g_object_address_table.Clear();
 
     Kernel::ThreadingShutdown();
     g_current_process = nullptr;
@@ -45,4 +48,4 @@ void Shutdown() {
     Kernel::MemoryShutdown();
 }
 
-} // namespace
+} // namespace Kernel