diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts
index 70d2590f7..8c71f7bc9 100644
--- a/src/server/MapPlaylist.ts
+++ b/src/server/MapPlaylist.ts
@@ -127,15 +127,27 @@ export class MapPlaylist {
 
     const rand = new PseudoRandom(Date.now());
 
-    const ffa: GameMapType[] = rand.shuffleArray([...maps]);
-    const team: GameMapType[] = rand.shuffleArray([...maps]);
+    const ffa1: GameMapType[] = rand.shuffleArray([...maps]);
+    const team1: GameMapType[] = rand.shuffleArray([...maps]);
+    const ffa2: GameMapType[] = rand.shuffleArray([...maps]);
+    const team2: GameMapType[] = rand.shuffleArray([...maps]);
+    const ffa3: GameMapType[] = rand.shuffleArray([...maps]);
 
     this.mapsPlaylist = [];
     for (let i = 0; i < maps.length; i++) {
-      if (!this.addNextMap(this.mapsPlaylist, ffa, GameMode.FFA)) {
+      if (!this.addNextMap(this.mapsPlaylist, ffa1, GameMode.FFA)) {
         return false;
       }
-      if (!this.addNextMap(this.mapsPlaylist, team, GameMode.Team)) {
+      if (!this.addNextMap(this.mapsPlaylist, team1, GameMode.Team)) {
+        return false;
+      }
+      if (!this.addNextMap(this.mapsPlaylist, ffa2, GameMode.FFA)) {
+        return false;
+      }
+      if (!this.addNextMap(this.mapsPlaylist, team2, GameMode.Team)) {
+        return false;
+      }
+      if (!this.addNextMap(this.mapsPlaylist, ffa3, GameMode.FFA)) {
         return false;
       }
     }