diff --git a/src/code/fault.c b/src/code/fault.c
index 91e5175523..a537f821e4 100644
--- a/src/code/fault.c
+++ b/src/code/fault.c
@@ -902,7 +902,7 @@ void Fault_CommitFB() {
     } else {
         fb = (u16*)osViGetNextFramebuffer();
         if ((u32)fb == 0x80000000) {
-            fb = (u16*)((osMemSize | 0x80000000) - 0x25800);
+            fb = (u16*)((osMemSize | 0x80000000) - sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH]));
         }
     }
 
diff --git a/src/code/fault_drawer.c b/src/code/fault_drawer.c
index 036247d8aa..d20ada8727 100644
--- a/src/code/fault_drawer.c
+++ b/src/code/fault_drawer.c
@@ -302,5 +302,5 @@ void FaultDrawer_WritebackFBDCache() {
 
 void FaultDrawer_SetDefault() {
     bcopy(&sFaultDrawerDefault, &sFaultDrawerStruct, sizeof(FaultDrawer));
-    sFaultDrawerStruct.fb = (u16*)((osMemSize | 0x80000000) - 0x25800);
+    sFaultDrawerStruct.fb = (u16*)((osMemSize | 0x80000000) - sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH]));
 }