diff --git a/src/buffers/buffers.c b/src/buffers/buffers.c
index 5d382702f..f231ca8b7 100644
--- a/src/buffers/buffers.c
+++ b/src/buffers/buffers.c
@@ -20,14 +20,8 @@ ALIGNED8 u8 gThread5Stack[0x2000];
 ALIGNED8 u8 gThread6Stack[0x2000];
 #endif
 // 0x400 bytes
-#if UNF
-ALIGNED16 u8 gGfxSPTaskStack[SP_DRAM_STACK_SIZE8];
-ALIGNED16 u8 gGfxSPTaskYieldBuffer[OS_YIELD_DATA_SIZE];
-#else
-// 0xc00 bytes for f3dex, 0x900 otherwise
-ALIGNED8 u8 gGfxSPTaskStack[SP_DRAM_STACK_SIZE8];
-ALIGNED8 u8 gGfxSPTaskYieldBuffer[OS_YIELD_DATA_SIZE];
-#endif // UNF
+__attribute__((aligned(32))) u8 gGfxSPTaskStack[SP_DRAM_STACK_SIZE8];
+__attribute__((aligned(32))) u8 gGfxSPTaskYieldBuffer[OS_YIELD_DATA_SIZE];
 // 0x200 bytes
 struct SaveBuffer __attribute__ ((aligned (8))) gSaveBuffer;
 // 0x190a0 bytes