diff --git a/app/features/tournament/actions/to.$id.register.server.ts b/app/features/tournament/actions/to.$id.register.server.ts
index 1d772b3c0..a200870b0 100644
--- a/app/features/tournament/actions/to.$id.register.server.ts
+++ b/app/features/tournament/actions/to.$id.register.server.ts
@@ -73,6 +73,12 @@ export const action: ActionFunction = async ({ request, params }) => {
 					tournament.registrationOpen || data.teamName === ownTeam.name,
 					"Can't change team name after registration has closed",
 				);
+				errorToastIfFalsy(
+					!tournament.ctx.teams.some(
+						(team) => team.name === data.teamName && team.id !== ownTeam.id,
+					),
+					"Team name already taken for this tournament",
+				);
 
 				await TournamentTeamRepository.update({
 					userId: user.id,