diff --git a/build/gcdfirm/sdmc-launcher/ARM7/main.c b/build/gcdfirm/sdmc-launcher/ARM7/main.c
index f377d966..b1c11891 100644
--- a/build/gcdfirm/sdmc-launcher/ARM7/main.c
+++ b/build/gcdfirm/sdmc-launcher/ARM7/main.c
@@ -176,7 +176,9 @@ static void PostInit(void)
 ***************************************************************/
 static void EraseAll(void)
 {
-    AESi_ResetAesKey();
+    AESi_ResetAesKeyA();
+    AESi_ResetAesKeyB();
+    AESi_ResetAesKeyC();
     MI_CpuClearFast( OSi_GetFromFirmAddr(), sizeof(OSFromFirmBuf) );
 #ifdef SDK_FINALROM
     MI_CpuClearFast( (void*)HW_TWL_ROM_HEADER_BUF, HW_TWL_ROM_HEADER_BUF_SIZE );
@@ -314,7 +316,9 @@ void TwlSpMain( void )
 #endif
     PM_BackLightOn( TRUE );
 
-    AESi_ResetAesKey();
+    AESi_ResetAesKeyA();
+    AESi_ResetAesKeyB();
+    AESi_ResetAesKeyC();
     MI_CpuClearFast( OSi_GetFromFirmAddr(), sizeof(OSFromFirmBuf) );
     OS_BootFromFIRM();
 
diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c
index b2d70b58..51feb04d 100644
--- a/build/nandfirm/menu-launcher/ARM7/main.c
+++ b/build/nandfirm/menu-launcher/ARM7/main.c
@@ -176,7 +176,9 @@ static void PostInit(void)
 ***************************************************************/
 static void EraseAll(void)
 {
-    AESi_ResetAesKey();
+    AESi_ResetAesKeyA();
+    AESi_ResetAesKeyB();
+    AESi_ResetAesKeyC();
     MI_CpuClearFast( OSi_GetFromFirmAddr(), sizeof(OSFromFirmBuf) );
 #ifdef SDK_FINALROM
     MI_CpuClearFast( (void*)HW_TWL_ROM_HEADER_BUF, HW_TWL_ROM_HEADER_BUF_SIZE );
diff --git a/build/nandfirm/sdmc-launcher/ARM7/main.c b/build/nandfirm/sdmc-launcher/ARM7/main.c
index 46649285..e694d6f0 100644
--- a/build/nandfirm/sdmc-launcher/ARM7/main.c
+++ b/build/nandfirm/sdmc-launcher/ARM7/main.c
@@ -176,7 +176,9 @@ static void PostInit(void)
 ***************************************************************/
 static void EraseAll(void)
 {
-    AESi_ResetAesKey();
+    AESi_ResetAesKeyA();
+    AESi_ResetAesKeyB();
+    AESi_ResetAesKeyC();
     MI_CpuClearFast( OSi_GetFromFirmAddr(), sizeof(OSFromFirmBuf) );
 #ifdef SDK_FINALROM
     MI_CpuClearFast( (void*)HW_TWL_ROM_HEADER_BUF, HW_TWL_ROM_HEADER_BUF_SIZE );
@@ -314,7 +316,9 @@ void TwlSpMain( void )
 #endif
     PM_BackLightOn( TRUE );
 
-    AESi_ResetAesKey();
+    AESi_ResetAesKeyA();
+    AESi_ResetAesKeyB();
+    AESi_ResetAesKeyC();
     MI_CpuClearFast( OSi_GetFromFirmAddr(), sizeof(OSFromFirmBuf) );
     OS_BootFromFIRM();