diff --git a/CHANGES b/CHANGES
index d32d8ebb5..64f2da4ae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ Bugfixes:
  - ARM7: PSR mode bits should not get sign extended
  - GBA Video: Fix out of bounds sprite transforms
  - GBA: Only unhalt CPU if appropriate bit is set in IE
+ - GB: Fix crash when masking savedata
 Misc:
  - PSP2: Improved controller rumble
  - GB, GBA: Prevent loading null ROMs
diff --git a/src/gb/gb.c b/src/gb/gb.c
index 334d9f8b0..6028db0ba 100644
--- a/src/gb/gb.c
+++ b/src/gb/gb.c
@@ -222,6 +222,7 @@ void GBSavedataMask(struct GB* gb, struct VFile* vf, bool writeback) {
 	gb->sramVf = vf;
 	gb->sramMaskWriteback = writeback;
 	gb->memory.sram = vf->map(vf, gb->sramSize, MAP_READ);
+	GBMBCSwitchSramBank(gb, gb->memory.sramCurrentBank);
 }
 
 void GBSavedataUnmask(struct GB* gb) {