diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h
index 53c47c07a7..eeea7e77ce 100644
--- a/include/m_Do/m_Do_machine.h
+++ b/include/m_Do/m_Do_machine.h
@@ -15,6 +15,9 @@ void my_SysPrintHeap(char const*, void*, u32);
 void mDoMch_HeapCheckAll();
 void mDoMch_HeapFreeFillAll();
 int mDoMch_Create();
+#if TARGET_PC
+void mDoMch_Destroy();
+#endif
 
 extern GXRenderModeObj g_ntscZeldaProg;
 
diff --git a/libs/JSystem/include/JSystem/JFramework/JFWSystem.h b/libs/JSystem/include/JSystem/JFramework/JFWSystem.h
index bb4dfa01cd..288b5f03d8 100644
--- a/libs/JSystem/include/JSystem/JFramework/JFWSystem.h
+++ b/libs/JSystem/include/JSystem/JFramework/JFWSystem.h
@@ -33,6 +33,9 @@ struct JFWSystem {
 
     static void firstInit();
     static void init();
+#if TARGET_PC
+    static void shutdown();
+#endif
 
     static JUTConsole* getSystemConsole() { return systemConsole; }
     static JKRExpHeap* getSystemHeap() { return systemHeap; }
diff --git a/libs/JSystem/include/JSystem/JKernel/JKRAram.h b/libs/JSystem/include/JSystem/JKernel/JKRAram.h
index 9c8ebd88d1..dd3bf54f9c 100644
--- a/libs/JSystem/include/JSystem/JKernel/JKRAram.h
+++ b/libs/JSystem/include/JSystem/JKernel/JKRAram.h
@@ -39,6 +39,9 @@ public:
 
 public:
     static JKRAram* create(u32, u32, s32, s32, s32);
+#if TARGET_PC
+    static void destroy();
+#endif
     static void checkOkAddress(u8*, u32, JKRAramBlock*, u32);
     static void changeGroupIdIfNeed(u8*, int);
     static JKRAramBlock* mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
diff --git a/libs/JSystem/include/JSystem/JKernel/JKRDecomp.h b/libs/JSystem/include/JSystem/JKernel/JKRDecomp.h
index 9131ecfbaa..2e7ce0ef1c 100644
--- a/libs/JSystem/include/JSystem/JKernel/JKRDecomp.h
+++ b/libs/JSystem/include/JSystem/JKernel/JKRDecomp.h
@@ -48,6 +48,9 @@ private:
 
 public:
     static JKRDecomp* create(s32);
+#if TARGET_PC
+    static void destroy();
+#endif
     static JKRDecompCommand* prepareCommand(u8*, u8*, u32, u32, JKRDecompCommand::AsyncCallback);
     static void sendCommand(JKRDecompCommand*);
     static bool sync(JKRDecompCommand*, int);
diff --git a/libs/JSystem/src/JFramework/JFWSystem.cpp b/libs/JSystem/src/JFramework/JFWSystem.cpp
index b4effd547a..d6322f34c9 100644
--- a/libs/JSystem/src/JFramework/JFWSystem.cpp
+++ b/libs/JSystem/src/JFramework/JFWSystem.cpp
@@ -116,3 +116,9 @@ void JFWSystem::init() {
     void* buffer = systemHeap->alloc(CSetUpParam::exConsoleBufferSize, 4);
     JUTException::createConsole(buffer, CSetUpParam::exConsoleBufferSize);
 }
+
+#if TARGET_PC
+void JFWSystem::shutdown() {
+    JKRAram::destroy();
+}
+#endif
diff --git a/libs/JSystem/src/JKernel/JKRAram.cpp b/libs/JSystem/src/JKernel/JKRAram.cpp
index 32afe1cef4..2770328afa 100644
--- a/libs/JSystem/src/JKernel/JKRAram.cpp
+++ b/libs/JSystem/src/JKernel/JKRAram.cpp
@@ -42,6 +42,12 @@ JKRAram* JKRAram::create(u32 aram_audio_buffer_size, u32 aram_audio_graph_size,
     return sAramObject;
 }
 
+#if TARGET_PC
+void JKRAram::destroy() {
+    JKRDecomp::destroy();
+}
+#endif
+
 OSMessage JKRAram::sMessageBuffer[4] = {
     NULL,
     NULL,
diff --git a/libs/JSystem/src/JKernel/JKRDecomp.cpp b/libs/JSystem/src/JKernel/JKRDecomp.cpp
index 776823531d..a97edea0a3 100644
--- a/libs/JSystem/src/JKernel/JKRDecomp.cpp
+++ b/libs/JSystem/src/JKernel/JKRDecomp.cpp
@@ -20,6 +20,15 @@ JKRDecomp* JKRDecomp::create(s32 priority) {
     return sDecompObject;
 }
 
+#if TARGET_PC
+void JKRDecomp::destroy() {
+    if (sDecompObject) {
+        OSSendMessage(&sMessageQueue, nullptr, OS_MESSAGE_NOBLOCK);
+        OSJoinThread(sDecompObject->getThreadRecord(), nullptr);
+    }
+}
+#endif
+
 OSMessage JKRDecomp::sMessageBuffer[8] = {0};
 
 OSMessageQueue JKRDecomp::sMessageQueue = {0};
@@ -34,15 +43,15 @@ void* JKRDecomp::run() {
     OSInitMessageQueue(&sMessageQueue, sMessageBuffer, 8);
     for (;;) {
         OSMessage message;
-#ifdef TARGET_PC
-        if (!OSReceiveMessage(&sMessageQueue, &message, OS_MESSAGE_BLOCK)) {
-            break;
-        }
-#else
         OSReceiveMessage(&sMessageQueue, &message, OS_MESSAGE_BLOCK);
-#endif
 
         JKRDecompCommand* command = (JKRDecompCommand*)message;
+#if TARGET_PC
+        if (!command) {
+            break;
+        }
+#endif
+
         decode(command->mSrcBuffer, command->mDstBuffer, command->mSrcLength, command->mDstLength);
 
         if (command->field_0x20 != 0) {
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index fdab588957..6b186a77e6 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -1010,3 +1010,9 @@ int mDoMch_Create() {
 
     return 1;
 }
+
+#if TARGET_PC
+void mDoMch_Destroy() {
+    JFWSystem::shutdown();
+}
+#endif
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 9cb7e41764..8742436c4e 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -366,6 +366,8 @@ int game_main(int argc, char* argv[]) {
     fflush(stdout);
     fflush(stderr);
 
+    mDoMch_Destroy();
+
     // Notifies all CVs and causes threads to exit
     OSResetSystem(OS_RESET_SHUTDOWN, 0, 0);