diff --git a/Runtime/MP1/CGBASupport.cpp b/Runtime/MP1/CGBASupport.cpp
index 1806edc56..15351be26 100644
--- a/Runtime/MP1/CGBASupport.cpp
+++ b/Runtime/MP1/CGBASupport.cpp
@@ -18,6 +18,10 @@ void CGBASupport::Initialize() {
   g_JbusListener.start();
 }
 
+void CGBASupport::Shutdown() {
+  g_JbusListener.stop();
+}
+
 void CGBASupport::GlobalPoll() {
   if (g_JbusEndpoint && !g_JbusEndpoint->connected())
     g_JbusEndpoint.reset();
diff --git a/Runtime/MP1/CGBASupport.hpp b/Runtime/MP1/CGBASupport.hpp
index 301d2d0e6..29d7a95de 100644
--- a/Runtime/MP1/CGBASupport.hpp
+++ b/Runtime/MP1/CGBASupport.hpp
@@ -36,6 +36,7 @@ private:
 
 public:
   static void Initialize();
+  static void Shutdown();
   static void GlobalPoll();
 
   CGBASupport();
diff --git a/Runtime/MP1/MP1.cpp b/Runtime/MP1/MP1.cpp
index 0de336f5f..1c8c660df 100644
--- a/Runtime/MP1/MP1.cpp
+++ b/Runtime/MP1/MP1.cpp
@@ -926,6 +926,7 @@ void CMain::ShutdownSubsystems() {
   CAnimData::FreeCache();
   CMemoryCardSys::Shutdown();
   CMappableObject::Shutdown();
+  CGBASupport::Shutdown();
 }
 
 void CMain::Shutdown() {