diff --git a/CHANGES b/CHANGES
index 3e7ad3932..7b44a0886 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@ Bugfixes:
  - Qt: Fix Apply button for key and controller configurations
  - GB Video: Initialize LCDC in renderer
  - GBA I/O: Mask off WAITCNT bits that cannot be written
+ - GB Memory: Fix HDMA5 value after DMA completes
 Misc:
  - SDL: Remove scancode key input
  - GBA Video: Clean up unused timers
diff --git a/src/gb/memory.c b/src/gb/memory.c
index 0f874030b..7b8f7e716 100644
--- a/src/gb/memory.c
+++ b/src/gb/memory.c
@@ -437,7 +437,7 @@ void _GBMemoryHDMAService(struct GB* gb) {
 				gb->memory.isHdma = false;
 			}
 		} else {
-			gb->memory.io[REG_HDMA5] |= 0x80;
+			gb->memory.io[REG_HDMA5] = 0xFF;
 		}
 	}
 }