diff --git a/CHANGES b/CHANGES
index 5736255f8..997e8ea96 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@ Misc:
  - Qt: Prevent window from being created off-screen
  - Qt: Add option to disable FPS display
  - GBA: Improve multiboot image detection
+ - GB MBC: Remove erroneous bank 0 wrapping
 
 0.6.1: (2017-10-01)
 Bugfixes:
diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_1Mb/manifest.yml b/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_1Mb/manifest.yml
deleted file mode 100644
index a697ada66..000000000
--- a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_1Mb/manifest.yml
+++ /dev/null
@@ -1 +0,0 @@
-fail: true
diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_2Mb/manifest.yml b/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_2Mb/manifest.yml
deleted file mode 100644
index a697ada66..000000000
--- a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_2Mb/manifest.yml
+++ /dev/null
@@ -1 +0,0 @@
-fail: true
diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_512Kb/baseline_0000.png b/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_512Kb/baseline_0000.png
index 282b639d3..30590ffab 100644
Binary files a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_512Kb/baseline_0000.png and b/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_512Kb/baseline_0000.png differ
diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1_rom_4banks/manifest.yml b/cinema/gb/mooneye-gb/emulator-only/mbc1_rom_4banks/manifest.yml
deleted file mode 100644
index a697ada66..000000000
--- a/cinema/gb/mooneye-gb/emulator-only/mbc1_rom_4banks/manifest.yml
+++ /dev/null
@@ -1 +0,0 @@
-fail: true
diff --git a/src/gb/mbc.c b/src/gb/mbc.c
index 83ac2f2fc..6db033aaa 100644
--- a/src/gb/mbc.c
+++ b/src/gb/mbc.c
@@ -45,9 +45,6 @@ void GBMBCSwitchBank(struct GB* gb, int bank) {
 		mLOG(GB_MBC, GAME_ERROR, "Attempting to switch to an invalid ROM bank: %0X", bank);
 		bankStart &= (gb->memory.romSize - 1);
 		bank = bankStart / GB_SIZE_CART_BANK0;
-		if (!bank) {
-			++bank;
-		}
 	}
 	gb->memory.romBank = &gb->memory.rom[bankStart];
 	gb->memory.currentBank = bank;