diff --git a/CHANGES b/CHANGES
index 05b83e499..eb818acfc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.10.5: (Future)
+Other fixes:
+ - GBA Hardware: Fix loading states unconditionally overwriting GPIO memory
+
 0.10.4: (2024-12-07)
 Emulation fixes:
  - GB Audio: Fix audio envelope timing resetting too often (fixes mgba.io/i/3164)
diff --git a/src/gba/cart/gpio.c b/src/gba/cart/gpio.c
index b49cc8d67..eb5328346 100644
--- a/src/gba/cart/gpio.c
+++ b/src/gba/cart/gpio.c
@@ -498,7 +498,7 @@ void GBAHardwareDeserialize(struct GBACartridgeHardware* hw, const struct GBASer
 	LOAD_16(hw->direction, 0, &state->hw.pinDirection);
 	hw->devices = state->hw.devices;
 
-	if (hw->gpioBase) {
+	if ((hw->devices & (HW_RTC | HW_RUMBLE | HW_LIGHT_SENSOR | HW_GYRO | HW_TILT)) && hw->gpioBase) {
 		if (hw->readWrite) {
 			STORE_16(hw->pinState, 0, hw->gpioBase);
 			STORE_16(hw->direction, 2, hw->gpioBase);