diff --git a/app/routes/leagues/$leagueId.draft-board.$seasonId.tsx b/app/routes/leagues/$leagueId.draft-board.$seasonId.tsx
index a254e44..490f8f3 100644
--- a/app/routes/leagues/$leagueId.draft-board.$seasonId.tsx
+++ b/app/routes/leagues/$leagueId.draft-board.$seasonId.tsx
@@ -150,7 +150,7 @@ export default function DraftBoard() {
                 {season.league.name} - {season.year} Draft Board
               </h1>
               <div className="flex gap-4 text-sm text-muted-foreground mt-1">
-                <span>Round: {Math.ceil(currentPick / totalTeams)}</span>
+                <span>Round: {totalTeams > 0 ? Math.ceil(currentPick / totalTeams) : 1}</span>
                 <span>Pick: {currentPick}</span>
                 <span className="capitalize">
                   {season.status.replace("_", " ")}
diff --git a/app/routes/leagues/$leagueId.draft.$seasonId.tsx b/app/routes/leagues/$leagueId.draft.$seasonId.tsx
index a06917f..76c0ffc 100644
--- a/app/routes/leagues/$leagueId.draft.$seasonId.tsx
+++ b/app/routes/leagues/$leagueId.draft.$seasonId.tsx
@@ -654,7 +654,7 @@ export default function DraftRoom() {
   };
 
   // Calculate current round
-  const currentRound = Math.ceil(currentPick / draftSlots.length);
+  const currentRound = draftSlots.length > 0 ? Math.ceil(currentPick / draftSlots.length) : 1;
 
   // Determine whose turn it is
   const totalTeams = draftSlots.length;