diff --git a/server/src/events/RandomizeTeams.ts b/server/src/events/RandomizeTeams.ts
index 76beb27..2e85faa 100644
--- a/server/src/events/RandomizeTeams.ts
+++ b/server/src/events/RandomizeTeams.ts
@@ -16,6 +16,11 @@ export default (io: Server, socket: Socket, data: RandomizeTeams) => {
 		};
 		let game = games[data.game_code];
 
+		// Remove all players from all teams
+		for (var team of game.teams) {
+			team.removePlayers();
+		};
+
 		let players = [...game.players];
 		// game.log.info(players);
 		let new_team: 1|2 = 1;