diff --git a/lib/Multiplayer/BanchoLobby.js b/lib/Multiplayer/BanchoLobby.js
index fc021cd92e431b025e57479f683a9f0642f4d2e5..ec589f10a48135e3093ea06e3721aacd2c404570 100644
--- a/lib/Multiplayer/BanchoLobby.js
+++ b/lib/Multiplayer/BanchoLobby.js
@@ -7,6 +7,7 @@ const BanchoLobbyPlayerStates = require("./Enums/BanchoLobbyPlayerStates");
 const BanchoLobbyTeams = require("./Enums/BanchoLobbyTeams");
 const Regexes = require("./BanchoLobbyRegexes");
 const Teams = require("./Enums/BanchoLobbyTeams");
+const BanchoLobbyTeamModes = require("./Enums/BanchoLobbyTeamModes");
 
 /**
  * Represents a Bancho multiplayer lobby
@@ -1081,6 +1082,15 @@ class BanchoLobby extends EventEmitter {
 	 * @see BanchoLobbyTeamModes
 	 */
 	set teamMode(val) {
+		const teamModes = [BanchoLobbyTeamModes.TeamVs, BanchoLobbyTeamModes.TagTeamVs];
+		if(!teamModes.includes(this.teamMode) && teamModes.includes(val)) {
+			for(let i = 0; i < this.slots.length; i++) {
+				const slot = this.slots[i];
+				if (slot !== null) {
+					slot.team = i % 2 === 0 ? BanchoLobbyTeams.Blue : BanchoLobbyTeams.Red;
+				}
+			}
+		}
 		this._setter("teamMode", val);
 	}