diff --git a/app/features/tournament-bracket/components/BracketMapListDialog.tsx b/app/features/tournament-bracket/components/BracketMapListDialog.tsx
index 62a52a3e0..8152a4c79 100644
--- a/app/features/tournament-bracket/components/BracketMapListDialog.tsx
+++ b/app/features/tournament-bracket/components/BracketMapListDialog.tsx
@@ -546,7 +546,11 @@ function teamCountAdjustedBracketData({
 		// RR & swiss are different because for those the amount of participants won't affect the amount of rounds
 		case "round_robin":
 		case "swiss":
-			return bracket.data;
+			// 10 to ensure a full bracket gets generated even if registration is underway
+			return tournament.generateMatchesData(
+				nullFilledArray(10).map((_, i) => i + 1),
+				bracket.type,
+			);
 		case "single_elimination":
 			return tournament.generateMatchesData(
 				nullFilledArray(teamCount).map((_, i) => i + 1),
diff --git a/app/features/tournament-bracket/routes/to.$id.brackets.tsx b/app/features/tournament-bracket/routes/to.$id.brackets.tsx
index 745079120..3527b8919 100644
--- a/app/features/tournament-bracket/routes/to.$id.brackets.tsx
+++ b/app/features/tournament-bracket/routes/to.$id.brackets.tsx
@@ -540,6 +540,7 @@ function BracketStarter({
 					close={close}
 					bracket={bracket}
 					bracketIdx={bracketIdx}
+					key={bracketIdx}
 				/>
 			) : null}
 			<Button
@@ -587,6 +588,7 @@ function MapPreparer({
 					bracket={bracket}
 					bracketIdx={bracketIdx}
 					isPreparing
+					key={bracketIdx}
 				/>
 			) : null}
 			<div className="stack sm horizontal ml-auto">