diff --git a/src/event_race_logic.js b/src/event_race_logic.js
index 1c37e94..3c68cdb 100644
--- a/src/event_race_logic.js
+++ b/src/event_race_logic.js
@@ -509,6 +509,10 @@ export function getEventTeams(event, { normalizeRaceTeam }) {
 
 
 export function getTeamDriverPool(event, { getEventDrivers, state }) {
+  const classDrivers = state.drivers.filter((driver) => !event?.classId || driver.classId === event.classId);
+  if (classDrivers.length) {
+    return { drivers: classDrivers, fallback: false };
+  }
   const scopedDrivers = getEventDrivers(event);
   if (scopedDrivers.length) {
     return { drivers: scopedDrivers, fallback: false };
@@ -778,4 +782,3 @@ export function applyBumpsForRace(event, { buildFinalStandings, getSessionsForEv
 
   return applied;
 }
-