diff --git a/CHANGES b/CHANGES
index 59ac61b8e..ebd8cd21f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,10 @@
 0.8.4: (Future)
+Emulation fixes:
+ - GBA Video: Invalidate map cache when modifying BGCNT (fixes mgba.io/i/1846)
+Other fixes:
  - 3DS: Redo video sync to be more precise
  - 3DS: Fix crash with libctru 2.0 when exiting
- - GBA Video: Invalidate map cache when modifying BGCNT (fixes mgba.io/i/1846)
+ - Core: Fix reported ROM size when a fixed buffer size is used
  - Qt: Add dummy English translation file (fixes mgba.io/i/1469)
  - mGUI: Fix closing down a game if an exit is signalled
  - mVL: Fix injecting accidentally draining non-injection buffer
diff --git a/src/core/core.c b/src/core/core.c
index e68f43be9..3ead2daf3 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -145,7 +145,10 @@ bool mCorePreloadVFCB(struct mCore* core, struct VFile* vf, void (cb)(size_t, si
 #ifdef FIXED_ROM_BUFFER
 	extern uint32_t* romBuffer;
 	extern size_t romBufferSize;
-	vfm = VFileFromMemory(romBuffer, romBufferSize);
+	if (size > romBufferSize) {
+		size = romBufferSize;
+	}
+	vfm = VFileFromMemory(romBuffer, size);
 #else
 	vfm = VFileMemChunk(NULL, size);
 #endif