diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts
index 6a46c9ff2..09f3dbbf5 100644
--- a/src/server/MapPlaylist.ts
+++ b/src/server/MapPlaylist.ts
@@ -58,9 +58,9 @@ export class MapPlaylist {
         count--;
       }
     });
-    while (!this.allNonConsecutive(mapsPlaylist)) {
+    do {
       random.shuffleArray(mapsPlaylist);
-    }
+    } while (!this.allNonConsecutive(mapsPlaylist));
   }
 
   // Specifically controls how the playlists rotate.