diff --git a/include/sf64thread.h b/include/sf64thread.h
index 26c8e5b2..0f1900dc 100644
--- a/include/sf64thread.h
+++ b/include/sf64thread.h
@@ -120,7 +120,11 @@ extern u8 gSerialThreadStack[0x1000]; // 800E0FB0
 extern SPTask* gCurrentTask;
 extern SPTask* sAudioTasks[1];
 extern SPTask* sGfxTasks[2];
+#ifdef AVOID_UB
+extern SPTask* sNewAudioTasks[2];
+#else
 extern SPTask* sNewAudioTasks[1];
+#endif
 extern SPTask* sNewGfxTasks[2];
 extern u32 gSegments[16]; // 800E1FD0
 extern OSMesgQueue gPiMgrCmdQueue; // 800E2010
diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c
index 62b12c4d..11140abb 100644
--- a/src/sys/sys_main.c
+++ b/src/sys/sys_main.c
@@ -8,7 +8,11 @@ s32 sGammaMode = 1;
 SPTask* gCurrentTask;
 SPTask* sAudioTasks[1];
 SPTask* sGfxTasks[2];
+#ifdef AVOID_UB
+SPTask* sNewAudioTasks[2];
+#else
 SPTask* sNewAudioTasks[1];
+#endif
 SPTask* sNewGfxTasks[2];
 u32 gSegments[16];          // 800E1FD0
 OSMesgQueue gPiMgrCmdQueue; // 800E2010