diff --git a/src/g_game.c b/src/g_game.c
index 5d36b58d2..635e48922 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -653,8 +653,8 @@ maprecordpreset_t *G_AllocateMapRecordPreset(maprecord_t *record, const char *pr
 	*preset = (maprecordpreset_t){
 		.prename = {0},
 		.version = version,
-		.bestlap = 0,
-		.besttime = 0,
+		.bestlap = UINT32_MAX,
+		.besttime = UINT32_MAX,
 		.playtime = 0,
 	};
 	strlcpy(preset->prename, presetname, sizeof(preset->prename));
@@ -764,7 +764,7 @@ tic_t G_GetBestTime(INT16 map)
 	{
 		if (strcmp(record->presets[k].prename, "kart"))
 			continue; // doesn't count
-		if (record->presets[k].besttime && record->presets[k].besttime < besttime)
+		if (record->presets[k].besttime < besttime)
 			besttime = record->presets[k].besttime;
 	}
 
@@ -848,7 +848,7 @@ static void G_UpdateRecordReplays(void)
 	}
 	else
 	{
-		preset->bestlap = 0;
+		preset->bestlap = UINT32_MAX;
 	}
 
 	// Save demo!
diff --git a/src/k_hud.c b/src/k_hud.c
index 7d95fc23d..a2eb4a812 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -1640,7 +1640,7 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UI
 
 	worktime = drawtime/(60*TICRATE);
 
-	if (mode && !drawtime)
+	if (mode && drawtime == UINT32_MAX)
 		V_DrawKartString(TX, TY+3, splitflags, va("--'--\"--"));
 	else if (dontdraw) // overtime flash
 		;
diff --git a/src/m_menu.c b/src/m_menu.c
index 4ba7268f9..004d4b609 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -5422,7 +5422,7 @@ static void M_DrawStatsMaps(void)
 		CLEANUP(Z_Pfree) char *maptitle = G_BuildMapTitle(mnum+1);
 
 		V_DrawThinString(20, y, MENUCAPS, maptitle);
-		V_DrawThinString(160, y, MENUCAPS, preset == NULL || preset->besttime == 0 ? "--'--\"--" :
+		V_DrawThinString(160, y, MENUCAPS, preset == NULL || preset->besttime == UINT32_MAX ? "--'--\"--" :
 			va("%02d'%02d\"%02d",
 			G_TicsToMinutes(preset->besttime, true),
 			G_TicsToSeconds(preset->besttime),
@@ -5748,10 +5748,10 @@ void MD_DrawTimeAttackMenu(void)
 		if (levellistmode != LLM_ITEMBREAKER)
 		{
 			V_DrawRightAlignedString(149, 80, MENUCAPS|highlightflags, "Best Lap:");
-			K_drawKartTimestamp(preset ? preset->bestlap : 0, 19, 86, -1, 2);
+			K_drawKartTimestamp(preset ? preset->bestlap : UINT32_MAX, 19, 86, -1, 2);
 		}
 		V_DrawRightAlignedString(292, 80, MENUCAPS|highlightflags, "Best Time:");
-		K_drawKartTimestamp(preset ? preset->besttime : 0, 162, 86, cv_nextmap.value-1, 1);
+		K_drawKartTimestamp(preset ? preset->besttime : UINT32_MAX, 162, 86, cv_nextmap.value-1, 1);
 	}
 
 	// Draw current RA preset mode.