diff --git a/CHANGES b/CHANGES
index 7accca33f..d36fb9c27 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ Bugfixes:
  - GBA Memory: Fix alignment of LDM/STM on SRAM
  - GBA: Initialize uninitialized pristineRom and pristineRomSize members
  - GBA Memory: Fix unaligned out-of-bounds ROM loads
+ - GBA: Fix warnings when creating and loading savestates
 Misc:
  - Qt: Window size command line options are now supported
  - Qt: Increase usability of key mapper
diff --git a/src/gba/io.c b/src/gba/io.c
index 8a7785627..74a7e5610 100644
--- a/src/gba/io.c
+++ b/src/gba/io.c
@@ -210,7 +210,7 @@ static const int _isValidRegister[REG_MAX >> 1] = {
 	1, 1, 1, 0, 1, 0, 1, 0,
 	1, 1, 1, 0, 1, 0, 0, 0,
 	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 0, 0, 0,
+	1, 1, 1, 1, 0, 0, 0, 0,
 	// DMA
 	1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1,
@@ -250,7 +250,7 @@ static const int _isRSpecialRegister[REG_MAX >> 1] = {
 	// Audio
 	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, 1, 0, 0, 0,
 	1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 0, 0, 0, 0,
 	// DMA