diff --git a/app/routes/leagues/$leagueId.settings.tsx b/app/routes/leagues/$leagueId.settings.tsx
index 592109a..9318bf2 100644
--- a/app/routes/leagues/$leagueId.settings.tsx
+++ b/app/routes/leagues/$leagueId.settings.tsx
@@ -44,7 +44,9 @@ export function meta({ data }: Route.MetaArgs): Route.MetaDescriptors {
 const BRACKT_SLUG = "brackt";
 
 type LoaderSeason = Route.ComponentProps["loaderData"]["season"];
-type LoaderSportsSeason = Route.ComponentProps["loaderData"]["allSportsSeasons"][number];
+type LoaderSportsSeason = Route.ComponentProps["loaderData"]["allSportsSeasons"][number] & {
+  fantasySeasonId?: string | null;
+};
 
 function getInitialScoringPreset(season: LoaderSeason) {
   const rules: ScoringRules = {
@@ -73,7 +75,7 @@ function getInitialSelectedSports({
   season: LoaderSeason;
   allSportsSeasons: LoaderSportsSeason[];
 }) {
-  const linkedSeasons = season?.seasonSports?.map((s) => s.sportsSeason) ?? [];
+  const linkedSeasons = (season?.seasonSports?.map((s) => s.sportsSeason) ?? []) as LoaderSportsSeason[];
   const linkedIds = linkedSeasons.map((ss) => ss.id);
   const templateBrackt = findTemplateBrackt(allSportsSeasons);
   const privateBrackt = linkedSeasons.find((ss) => ss.sport.slug === BRACKT_SLUG && !!ss.fantasySeasonId);
@@ -346,7 +348,7 @@ export default function LeagueSettings({ loaderData, actionData }: Route.Compone
 
               <LeagueBasicsSection
                 active={activeSection === "league-basics"}
-                season={season}
+                season={season ?? null}
                 leagueName={leagueName}
                 onLeagueNameChange={(v) => { setLeagueName(v); markDirty(); }}
                 isPublicDraftBoard={isPublicDraftBoard}
@@ -400,7 +402,7 @@ export default function LeagueSettings({ loaderData, actionData }: Route.Compone
               <ScoringSection
                 active={activeSection === "scoring"}
                 canEditSports={canEditSports}
-                season={season}
+                season={season ?? null}
                 scoringPreset={scoringPreset}
                 onScoringPresetChange={(v) => { setScoringPreset(v); markDirty(); }}
                 scoringRules={scoringRules}
@@ -482,11 +484,11 @@ export default function LeagueSettings({ loaderData, actionData }: Route.Compone
             </Form>
           )}
 
-          <HistoryDangerSection
-            active={activeSection === "history-danger"}
-            league={{ id: league.id, name: league.name }}
-            season={season}
-            isAdmin={isAdmin}
+              <HistoryDangerSection
+                active={activeSection === "history-danger"}
+                league={{ id: league.id, name: league.name }}
+                season={season ?? null}
+                isAdmin={isAdmin}
             isDeleteDialogOpen={isDeleteDialogOpen}
             onDeleteDialogOpenChange={setIsDeleteDialogOpen}
             navigationState={navigation.state}