diff --git a/CHANGES b/CHANGES
index f5bb5541d..cf0960162 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@ Bugfixes:
  - GB MBC: Fix RTC access when no save file is loaded
  - GB: Properly clear KEY1 bit 0 when switching speeds
  - LR35902: Fix core never exiting with certain event patterns
+ - GBA Cheats: Fix uninitialized memory getting freed when saving
 Misc:
  - All: Only update version info if needed
  - FFmpeg: Encoding cleanup
diff --git a/src/gba/cheats.c b/src/gba/cheats.c
index 747caab48..5467819cd 100644
--- a/src/gba/cheats.c
+++ b/src/gba/cheats.c
@@ -300,14 +300,16 @@ static void GBACheatDumpDirectives(struct mCheatSet* set, struct StringList* dir
 	}
 	StringListClear(directives);
 
-	char** directive = StringListAppend(directives);
+	char** directive;
 	switch (cheats->gsaVersion) {
 	case 1:
 	case 2:
+		directive = StringListAppend(directives);
 		*directive = strdup("GSAv1");
 		break;
 	case 3:
 	case 4:
+		directive = StringListAppend(directives);
 		*directive = strdup("PARv3");
 		break;
 	}