diff --git a/src/g_game.c b/src/g_game.c
index 2264e6d3..cca68d44 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2293,10 +2293,8 @@ static inline void G_PlayerFinishLevel(INT32 player)
 		{
 			matchesplayed++;
 			if (M_UpdateUnlockablesAndExtraEmblems(true))
-			{
 				S_StartSound(NULL, sfx_ncitem);
-				G_SaveGameData(true); // only save if unlocked something
-			}
+			G_SaveGameData(true);
 		}
 
 		legitimateexit = false;
diff --git a/src/y_inter.c b/src/y_inter.c
index f9340608..50cae957 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -712,6 +712,9 @@ static void Y_UpdateRecordReplays(void)
 	if ((earnedEmblems = M_CheckLevelEmblems()))
 		CONS_Printf(M_GetText("\x82" "Earned %hu medal%s for Record Attack records.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : "");
 
+	// SRB2Kart - save here so you NEVER lose your earned times/medals.
+	G_SaveGameData(false);
+
 	// Update timeattack menu's replay availability.
 	CV_AddValue(&cv_nextmap, 1);
 	CV_AddValue(&cv_nextmap, -1);