diff --git a/src/state.rs b/src/state.rs
index d86abbc75d029314cfb14031c25a4d681ceb98f5..752709e9c7fa8123959c25de9f14c93b56df0e57 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -136,8 +136,8 @@ impl State for BeesState {
             name: BeesName::from_gb(gb),
             info: BeesInfo::from_gb(gb),
             core: BeesCore::from_gb(gb),
-            end: BeesBlock::from_magic(String::from("END ")),
             mbc: BeesMbc::from_gb(gb),
+            end: BeesBlock::from_magic(String::from("END ")),
         }
     }
 
@@ -832,6 +832,9 @@ impl State for BeesMbc {
             crate::rom::MbcType::Mbc7 => todo!(),
             crate::rom::MbcType::Unknown => todo!(),
         }
+        if gb.mmu().boot_active() {
+            registers.clear();
+        }
 
         Self::new(registers)
     }