diff --git a/src/event_manager_controller.js b/src/event_manager_controller.js
index 618e761..5aabcc1 100644
--- a/src/event_manager_controller.js
+++ b/src/event_manager_controller.js
@@ -125,7 +125,7 @@ export function renderEventManagerView(context) {
   const isEndurancePreset = event.mode === "race" && selectedPreset?.id === "endurance";
   const showTeamsSection =
     event.mode === "race" &&
-    (isEndurancePreset || sessions.some((session) => session.type === "team_race") || raceTeams.length > 0 || Boolean(selectedTeamEditId));
+    (sessions.some((session) => session.type === "team_race") || raceTeams.length > 0 || Boolean(selectedTeamEditId));
   const showBasicQualifyingFields = raceFormatAdvanced || !isEndurancePreset;
   const showBasicFinalFields = raceFormatAdvanced || !isEndurancePreset;
   const selectedParticipantCount = event.mode === "race" ? (event.raceConfig.participantsConfigured ? (event.raceConfig.driverIds || []).length : raceDrivers.length) : 0;
diff --git a/src/event_manager_view.js b/src/event_manager_view.js
index 5f45d5b..83be2b7 100644
--- a/src/event_manager_view.js
+++ b/src/event_manager_view.js
@@ -306,7 +306,7 @@ export function renderEventManagerMarkup(context) {
                       <div class="panel-body"><p class="hint">${t("events.team_form_drivers")}</p></div>
                       ${teamDriverPool.fallback ? `<div class="panel-body"><p class="hint">${t("events.team_driver_fallback")}</p></div>` : ""}
                       <div class="panel-body check-grid">
-                        ${raceDrivers
+                        ${teamDriverPool.drivers
                           .map(
                             (driver) => `
                               <label class="check-card">