diff --git a/src/components/leaderboard/editors/TracksEditor.tsx b/src/components/leaderboard/editors/TracksEditor.tsx
index 1534dda..028e80c 100644
--- a/src/components/leaderboard/editors/TracksEditor.tsx
+++ b/src/components/leaderboard/editors/TracksEditor.tsx
@@ -75,7 +75,7 @@ export function TracksEditor({ tracks, drivers, pointsTable, onChange }: TracksE
 				id: crypto.randomUUID(),
 				name: `Race ${tracks.length + 1}`,
 				results: drivers.map((d) => ({ driverId: d.id, score: 'DNS' as const })),
-				fastestLapDriverId: ''
+				fastestLapDriverId: null
 			}
 		]);
 	};
@@ -95,8 +95,8 @@ export function TracksEditor({ tracks, drivers, pointsTable, onChange }: TracksE
 						<div className="flex items-center gap-2">
 							<label className="text-xs text-gray-400">FL Driver:</label>
 							<select
-								value={track.fastestLapDriverId}
-								onChange={(e) => updateTrack(ti, { fastestLapDriverId: e.target.value })}
+								value={track.fastestLapDriverId ?? ''}
+								onChange={(e) => updateTrack(ti, { fastestLapDriverId: e.target.value || null })}
 								className="rounded bg-gray-600 px-2 py-1 text-sm text-white"
 							>
 								<option value="">—</option>
diff --git a/src/lib/schemas/leaderboard.ts b/src/lib/schemas/leaderboard.ts
index c12348d..e71196f 100644
--- a/src/lib/schemas/leaderboard.ts
+++ b/src/lib/schemas/leaderboard.ts
@@ -36,7 +36,7 @@ export const leaderboardTrackSchema = z.object({
 	id: z.string(),
 	name: z.string().min(1),
 	results: z.array(z.object({ driverId: z.string(), score: resultValueSchema })),
-	fastestLapDriverId: z.string()
+	fastestLapDriverId: z.string().nullable()
 });
 export type LeaderboardTrack = z.infer<typeof leaderboardTrackSchema>;