diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 16911a3dddbd..e0f1ac37d959 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1318,8 +1318,10 @@ void CharacterGenerator::finish() {
 		_chargenMagicShapes = 0;
 	}
 
-	for (int i = 0; i < 17; i++)
+	for (int i = 0; i < 17; i++) {
 		delete[] _chargenButtonLabels[i];
+		_chargenButtonLabels[i] = 0;
+	}
 }
 
 const EoBChargenButtonDef CharacterGenerator::_chargenButtonDefs[] = {