diff --git a/CHANGES b/CHANGES
index 054fc08b5..54ea3eab3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@ Bugfixes:
  - GBA BIOS: Prevent CpuSet and CpuFastSet from using BIOS addresses as a source (fixes #184)
  - GBA RR: Fix fallthrough error when reading tags from a movie
  - GBA Thread: Fix possible deadlock in video sync
+ - GBA: Fix savestate loading of DISPSTAT and WAITCNT registers
 Misc:
  - GBA Audio: Change internal audio sample buffer from 32-bit to 16-bit samples
  - GBA Memory: Simplify memory API and use fixed bus width
diff --git a/src/gba/io.c b/src/gba/io.c
index 3adb28d08..a39d7c444 100644
--- a/src/gba/io.c
+++ b/src/gba/io.c
@@ -241,7 +241,7 @@ static const int _isValidRegister[REG_MAX >> 1] = {
 
 static const int _isSpecialRegister[REG_MAX >> 1] = {
 	// Video
-	0, 0, 0, 1, 0, 0, 0, 0,
+	0, 0, 1, 1, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -278,7 +278,7 @@ static const int _isSpecialRegister[REG_MAX >> 1] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	// Interrupts
-	1, 1, 1, 0, 1
+	1, 1, 0, 0, 1
 };
 
 void GBAIOInit(struct GBA* gba) {