diff --git a/source/ControllerSwitch/SwitchVirtualGamepadHandler.cpp b/source/ControllerSwitch/SwitchVirtualGamepadHandler.cpp
index b2ae113..8df5d84 100644
--- a/source/ControllerSwitch/SwitchVirtualGamepadHandler.cpp
+++ b/source/ControllerSwitch/SwitchVirtualGamepadHandler.cpp
@@ -34,7 +34,7 @@ void SwitchVirtualGamepadHandler::OutputThreadLoop(void *handler)
 
 Result SwitchVirtualGamepadHandler::InitInputThread()
 {
-    R_TRY(m_inputThread.Initialize(&SwitchVirtualGamepadHandler::InputThreadLoop, this, 0x3B).GetValue());
+    R_TRY(m_inputThread.Initialize(&SwitchVirtualGamepadHandler::InputThreadLoop, this, 0x3F).GetValue());
     m_inputThreadIsRunning = true;
     return m_inputThread.Start().GetValue();
 }
@@ -47,7 +47,7 @@ void SwitchVirtualGamepadHandler::ExitInputThread()
 
 Result SwitchVirtualGamepadHandler::InitOutputThread()
 {
-    R_TRY(m_outputThread.Initialize(&SwitchVirtualGamepadHandler::OutputThreadLoop, this, 0x3B).GetValue());
+    R_TRY(m_outputThread.Initialize(&SwitchVirtualGamepadHandler::OutputThreadLoop, this, 0x3F).GetValue());
     m_outputThreadIsRunning = true;
     return m_outputThread.Start().GetValue();
 }
diff --git a/source/Sysmodule/source/usb_module.cpp b/source/Sysmodule/source/usb_module.cpp
index 2c04e76..d5134a0 100644
--- a/source/Sysmodule/source/usb_module.cpp
+++ b/source/Sysmodule/source/usb_module.cpp
@@ -27,10 +27,10 @@ namespace syscon::usb
         void UsbDs4EventThreadFunc(void *arg);
         void UsbInterfaceChangeThreadFunc(void *arg);
 
-        ams::os::StaticThread<0x2'000> g_usb_event_thread(&UsbEventThreadFunc, nullptr, 0x20);
-        ams::os::StaticThread<0x2'000> g_ds3_event_thread(&UsbDs3EventThreadFunc, nullptr, 0x21);
-        ams::os::StaticThread<0x2'000> g_ds4_event_thread(&UsbDs4EventThreadFunc, nullptr, 0x22);
-        ams::os::StaticThread<0x2'000> g_usb_interface_change_thread(&UsbInterfaceChangeThreadFunc, nullptr, 0x23);
+        ams::os::StaticThread<0x2'000> g_usb_event_thread(&UsbEventThreadFunc, nullptr, 0x3A);
+        ams::os::StaticThread<0x2'000> g_ds3_event_thread(&UsbDs3EventThreadFunc, nullptr, 0x3B);
+        ams::os::StaticThread<0x2'000> g_ds4_event_thread(&UsbDs4EventThreadFunc, nullptr, 0x3C);
+        ams::os::StaticThread<0x2'000> g_usb_interface_change_thread(&UsbInterfaceChangeThreadFunc, nullptr, 0x2C);
 
         bool is_usb_event_thread_running = false;
         bool is_usb_interface_change_thread_running = false;