diff --git a/app/routes/leagues/$leagueId.draft.$seasonId.tsx b/app/routes/leagues/$leagueId.draft.$seasonId.tsx
index df163f3..fa3767e 100644
--- a/app/routes/leagues/$leagueId.draft.$seasonId.tsx
+++ b/app/routes/leagues/$leagueId.draft.$seasonId.tsx
@@ -1021,12 +1021,16 @@ export default function DraftRoom() {
   const currentRound = draftSlots.length > 0 ? Math.ceil(currentPick / draftSlots.length) : 1;
 
   // Determine whose turn it is
-  const currentDraftSlot = getTeamForPick(currentPick, draftSlots);
+  const currentDraftSlot = useMemo(
+    () => getTeamForPick(currentPick, draftSlots),
+    [currentPick, draftSlots]
+  );
   const isMyTurn = !!(
     userTeam && currentDraftSlot && currentDraftSlot.team.id === userTeam.id
   );
   const canPick = isMyTurn && season.status === "draft" && !isPaused; // Only team owner on their turn when draft is active
 
+  const currentDraftSlotOwnerName = currentDraftSlot ? ownerMap[currentDraftSlot.team.id] : undefined;
   const currentClockTime = currentDraftSlot ? teamTimers[currentDraftSlot.team.id] : undefined;
   const currentClockColor = getTimerColorClass(currentClockTime);
 
@@ -1327,7 +1331,12 @@ export default function DraftRoom() {
             <div className={`text-xs font-bold uppercase tracking-wider ${isMyTurn ? "text-electric" : "text-muted-foreground"}`}>
               {isMyTurn ? "Your Turn!" : "On the Clock"}
             </div>
-            <div className="text-sm font-bold">{currentDraftSlot.team.name}</div>
+            <div className="text-sm font-bold">
+              {currentDraftSlotOwnerName ?? currentDraftSlot.team.name}
+            </div>
+            {currentDraftSlotOwnerName && (
+              <div className="text-xs text-muted-foreground">{currentDraftSlot.team.name}</div>
+            )}
           </div>
           {isPaused ? (
             <span className="text-sm font-bold text-amber-accent">Paused</span>
@@ -1452,8 +1461,11 @@ export default function DraftRoom() {
                             {isMyTurn ? "Your Turn!" : "On the Clock"}
                           </div>
                           <div className={`text-sm font-bold ${isMyTurn ? "text-foreground" : "text-muted-foreground"}`}>
-                            {currentDraftSlot.team.name}
+                            {currentDraftSlotOwnerName ?? currentDraftSlot.team.name}
                           </div>
+                          {currentDraftSlotOwnerName && (
+                            <div className="text-xs text-muted-foreground">{currentDraftSlot.team.name}</div>
+                          )}
                         </div>
                         {isPaused ? (
                           <span className="text-sm font-bold text-amber-accent">Paused</span>