diff --git a/packages/engine-api/src/game/GameTypes.ts b/packages/engine-api/src/game/GameTypes.ts
index 7f85120a13..c53a698833 100644
--- a/packages/engine-api/src/game/GameTypes.ts
+++ b/packages/engine-api/src/game/GameTypes.ts
@@ -140,12 +140,6 @@ export enum RankedType {
   ClanWars = "clanwars",
 }
 
-// Ranked FFA lobby size. The API's matcher assigns between these many players
-// and only rates a game whose roster is in this range, so a match that ends
-// up with fewer is cancelled before it starts.
-export const RANKED_FFA_MIN_PLAYERS = 4;
-export const RANKED_FFA_MAX_PLAYERS = 10;
-
 export const isGameMode = (value: unknown): value is GameMode =>
   isEnumValue(GameMode, value);
 
diff --git a/packages/shared/src/CloseCodes.ts b/packages/shared/src/CloseCodes.ts
index 827854abd2..83a071c67e 100644
--- a/packages/shared/src/CloseCodes.ts
+++ b/packages/shared/src/CloseCodes.ts
@@ -16,6 +16,7 @@ export const CloseCode = {
   InvalidClan: 4101,
   ClanVerificationFailed: 4102,
   NotTrusted: 4103,
+  ModeRetired: 4104,
 } as const;
 
 export type CloseCode = (typeof CloseCode)[keyof typeof CloseCode];
@@ -44,6 +45,7 @@ export const CloseReason = {
   CannotJoin: "close_reason.cannot_join",
   NotAllowlisted: "close_reason.not_allowlisted",
   NotTrusted: "close_reason.not_trusted",
+  ModeRetired: "close_reason.mode_retired",
   LobbyFull: "close_reason.lobby_full",
   WrongWorker: "close_reason.wrong_worker",
   InternalError: "close_reason.internal_error",
diff --git a/resources/lang/en.json b/resources/lang/en.json
index 675a0d9f40..a277487271 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -579,6 +579,7 @@
     "invalid_token": "Your session token was rejected.",
     "lobby_full": "The lobby is full.",
     "login_required": "You must be logged in to play on this server.",
+    "mode_retired": "This queue has been retired. Pick another mode.",
     "no_heartbeat": "The server stopped hearing from you.",
     "not_allowlisted": "You are not on this lobby's allowlist.",
     "not_trusted": "This lobby is limited to trusted accounts. You can still join any other lobby.",
@@ -1688,7 +1689,6 @@
     "title": "1v1 Ranked Matchmaking (ALPHA)",
     "title_2v2": "2v2 Ranked Matchmaking (ALPHA)",
     "title_clanwars": "Clan Wars Ranked Matchmaking (ALPHA)",
-    "title_ffa": "FFA Ranked Matchmaking (ALPHA)",
     "waiting_for_game": "Waiting for game to start..."
   },
   "mode_selector": {
@@ -1698,8 +1698,7 @@
     "ranked_2v2_title": "2v2",
     "ranked_clanwars_subtitle": "Your clan vs theirs",
     "ranked_clanwars_title": "Clan Wars",
-    "ranked_ffa_title": "FFA",
-    "ranked_pairing_note": "In team modes, clanmates and friends in the queue are placed on the same team where possible. Friends are paired first, then clanmates. If your ratings are too far apart you'll be matched separately to keep games fair. In FFA, 4 to 10 players are matched by rating, and friends and clanmates are never placed in the same game. In Clan Wars, every team is one clan: you play only alongside members of the clan you queue for, and the clan's rating rises or falls with the result.",
+    "ranked_pairing_note": "In team modes, clanmates and friends in the queue are placed on the same team where possible. Friends are paired first, then clanmates. If your ratings are too far apart you'll be matched separately to keep games fair. In Clan Wars, every team is one clan: you play only alongside members of the clan you queue for, and the clan's rating rises or falls with the result.",
     "ranked_title": "Ranked",
     "ranked_trust_required_body": "Ranked only accepts trusted accounts. To become trusted, play more games or make any purchase.",
     "ranked_trust_required_body_crazygames": "Ranked only accepts trusted accounts. To become trusted, play more games.",
diff --git a/src/client/Main.ts b/src/client/Main.ts
index 5ccf7a144a..55d63ac381 100644
--- a/src/client/Main.ts
+++ b/src/client/Main.ts
@@ -103,6 +103,7 @@ import {
 } from "./PresenceGroup";
 import { fetchMyGameXp, fetchProgressionConfig } from "./ProgressionApi";
 import { startProvisionalProgress } from "./ProvisionalProgress";
+import { consumeRequeueUrl } from "./RequeueUrl";
 import type { RewardsModal } from "./RewardsModal";
 import {
   ensureServerList,
@@ -1576,7 +1577,9 @@ class Client {
       window.location.href = homeHref();
     }
 
-    const requeueMode = this.consumeRequeueUrl();
+    const requeueMode = consumeRequeueUrl(window.location, (url) =>
+      history.replaceState(null, "", url),
+    );
     if (requeueMode !== null) {
       document.dispatchEvent(
         new CustomEvent("open-matchmaking", {
@@ -1608,29 +1611,6 @@ class Client {
     if (customElements.get("store-modal")) this.storeModal?.refresh();
   }
 
-  // Returns the requeue mode ("/?requeue" = 1v1, "/?requeue=2v2" = 2v2,
-  // "/?requeue=ffa" = FFA, "/?requeue=clanwars" = clan wars), or null when
-  // the URL has no requeue param.
-  private consumeRequeueUrl(): MatchmakingMode | null {
-    const searchParams = new URLSearchParams(window.location.search);
-    if (!searchParams.has("requeue")) {
-      return null;
-    }
-    const param = searchParams.get("requeue");
-    const mode =
-      param === "2v2" || param === "ffa" || param === "clanwars"
-        ? param
-        : "1v1";
-
-    searchParams.delete("requeue");
-    const newUrl =
-      window.location.pathname +
-      (searchParams.toString() ? `?${searchParams.toString()}` : "") +
-      window.location.hash;
-    history.replaceState(null, "", newUrl);
-    return mode;
-  }
-
   private desktopUpdateState: DesktopUpdateState | null = null;
 
   // See the call site in handleUrl. True when a navigation was issued.
diff --git a/src/client/Matchmaking.ts b/src/client/Matchmaking.ts
index f7aafe2284..9c4ccf4e14 100644
--- a/src/client/Matchmaking.ts
+++ b/src/client/Matchmaking.ts
@@ -24,7 +24,7 @@ import { translateText } from "./Utils";
 
 // The ranked queues. Same strings as RankedType, the API's `mode` param and
 // the `/?requeue=` value.
-export type MatchmakingMode = "1v1" | "2v2" | "ffa" | "clanwars";
+export type MatchmakingMode = "1v1" | "2v2" | "clanwars";
 
 type MatchmakingJoin = {
   type: "join";
@@ -75,11 +75,9 @@ export class MatchmakingModal extends BaseModal {
     const title = translateText(
       this.mode === "2v2"
         ? "matchmaking_modal.title_2v2"
-        : this.mode === "ffa"
-          ? "matchmaking_modal.title_ffa"
-          : this.mode === "clanwars"
-            ? "matchmaking_modal.title_clanwars"
-            : "matchmaking_modal.title",
+        : this.mode === "clanwars"
+          ? "matchmaking_modal.title_clanwars"
+          : "matchmaking_modal.title",
     );
     return modalHeader({
       titleContent: html`<span class="${DEFAULT_TITLE_CLASS}">${title}</span>
@@ -517,9 +515,7 @@ export class MatchmakingModal extends BaseModal {
     const row =
       this.mode === "2v2"
         ? userMe.player.leaderboard?.twoVtwo
-        : this.mode === "ffa"
-          ? userMe.player.leaderboard?.ffa
-          : userMe.player.leaderboard?.oneVone;
+        : userMe.player.leaderboard?.oneVone;
     this.elo = row?.elo ?? translateText("matchmaking_modal.no_elo");
     this.selectedClanTag = this.selectedClanFrom(userMe);
     // Clan wars is played for a clan: without one of the player's own clans
diff --git a/src/client/RequeueUrl.ts b/src/client/RequeueUrl.ts
new file mode 100644
index 0000000000..b3a02b1015
--- /dev/null
+++ b/src/client/RequeueUrl.ts
@@ -0,0 +1,53 @@
+import { RankedType } from "@openfront/engine-api/game/GameTypes";
+import type { MatchmakingMode } from "./Matchmaking";
+
+// Kept tiny and free of game-client imports: Main (the homepage chunk) loads
+// it statically.
+
+// The queue a `/?requeue=` value reopens: "" (a bare `/?requeue`) = 1v1,
+// "2v2" = 2v2, "clanwars" = clan wars. Ranked FFA has no queue any more, so
+// "ffa" (a stale link or bookmark) reopens nothing; any other value falls
+// back to 1v1.
+export function requeueModeFromParam(param: string): MatchmakingMode | null {
+  if (param === "ffa") return null;
+  return param === "2v2" || param === "clanwars" ? param : "1v1";
+}
+
+// The queue the win modal's "play again" reopens for a finished game, or null
+// when there is none (an unranked game, or a ranked FFA whose queue is gone).
+export function requeueModeForRankedType(
+  rankedType: RankedType | undefined,
+): MatchmakingMode | null {
+  switch (rankedType) {
+    case RankedType.OneVOne:
+      return "1v1";
+    case RankedType.TwoVTwo:
+      return "2v2";
+    case RankedType.ClanWars:
+      return "clanwars";
+    default:
+      return null;
+  }
+}
+
+// Reads and strips the `requeue` param from the URL. Returns the mode to
+// reopen, or null when the URL has no requeue param or its mode has no queue
+// (the param is stripped in the second case too).
+export function consumeRequeueUrl(
+  location: Pick<Location, "search" | "pathname" | "hash">,
+  replaceUrl: (url: string) => void,
+): MatchmakingMode | null {
+  const searchParams = new URLSearchParams(location.search);
+  if (!searchParams.has("requeue")) {
+    return null;
+  }
+  const mode = requeueModeFromParam(searchParams.get("requeue") ?? "");
+
+  searchParams.delete("requeue");
+  const newUrl =
+    location.pathname +
+    (searchParams.toString() ? `?${searchParams.toString()}` : "") +
+    location.hash;
+  replaceUrl(newUrl);
+  return mode;
+}
diff --git a/src/client/components/RankedModal.ts b/src/client/components/RankedModal.ts
index 2ec09011be..415bdab25c 100644
--- a/src/client/components/RankedModal.ts
+++ b/src/client/components/RankedModal.ts
@@ -21,7 +21,6 @@ export class RankedModal extends BaseModal {
 
   @state() private elo: number | string = "...";
   @state() private elo2v2: number | string = "...";
-  @state() private eloFfa: number | string = "...";
   @state() private userMeResponse: UserMeResponse | false = false;
   @state() private errorMessage: string | null = null;
   // Hides the trust lock until /users/@me answers, so a trusted player
@@ -72,7 +71,6 @@ export class RankedModal extends BaseModal {
     if (this.errorMessage) {
       this.elo = translateText("map_component.error");
       this.elo2v2 = translateText("map_component.error");
-      this.eloFfa = translateText("map_component.error");
       return;
     }
 
@@ -83,7 +81,6 @@ export class RankedModal extends BaseModal {
       const noElo = translateText("matchmaking_modal.no_elo");
       this.elo = leaderboard?.oneVone?.elo ?? noElo;
       this.elo2v2 = leaderboard?.twoVtwo?.elo ?? noElo;
-      this.eloFfa = leaderboard?.ffa?.elo ?? noElo;
     }
   }
 
@@ -92,7 +89,6 @@ export class RankedModal extends BaseModal {
     this.showTrustRequired = false;
     this.elo = "...";
     this.elo2v2 = "...";
-    this.eloFfa = "...";
     this.errorMessage = null;
 
     try {
@@ -107,7 +103,6 @@ export class RankedModal extends BaseModal {
       this.errorMessage = translateText("map_component.error");
       this.elo = translateText("map_component.error");
       this.elo2v2 = translateText("map_component.error");
-      this.eloFfa = translateText("map_component.error");
     } finally {
       this.loading = false;
       this.updateElo();
@@ -146,19 +141,12 @@ export class RankedModal extends BaseModal {
                 : translateText("mode_selector.ranked_title")),
             () => this.handleRanked("2v2"),
           )}
-          ${this.renderCard(
-            translateText("mode_selector.ranked_ffa_title"),
-            this.errorMessage ??
-              (this.isRankedEligible()
-                ? translateText("matchmaking_modal.elo", { elo: this.eloFfa })
-                : translateText("mode_selector.ranked_title")),
-            () => this.handleRanked("ffa"),
-          )}
           ${this.renderCard(
             translateText("mode_selector.ranked_clanwars_title"),
             this.errorMessage ??
               translateText("mode_selector.ranked_clanwars_subtitle"),
             () => this.handleRanked("clanwars"),
+            true,
           )}
         </div>
         <p class="mt-6 text-xs text-white/60 leading-relaxed text-center">
@@ -175,7 +163,12 @@ export class RankedModal extends BaseModal {
     `;
   }
 
-  private renderCard(title: string, subtitle: string, onClick: () => void) {
+  private renderCard(
+    title: string,
+    subtitle: string,
+    onClick: () => void,
+    wide = false,
+  ) {
     // Ranked admits trusted accounts only: a green open lock when the
     // player's account is trusted, a red closed one otherwise.
     const lock = this.trustKnown()
@@ -188,7 +181,9 @@ export class RankedModal extends BaseModal {
     return html`
       <button
         @click=${onClick}
-        class="relative flex flex-col w-full h-28 sm:h-32 rounded-2xl bg-malibu-blue border-0 transition-all duration-200 hover:bg-aquarius hover:scale-[1.03] hover:shadow-[var(--shadow-action-card-hover)] active:bg-malibu-blue/80 active:scale-[0.98] p-6 items-center justify-center gap-3"
+        class="${wide
+          ? "sm:col-span-2 "
+          : ""}relative flex flex-col w-full h-28 sm:h-32 rounded-2xl bg-malibu-blue border-0 transition-all duration-200 hover:bg-aquarius hover:scale-[1.03] hover:shadow-[var(--shadow-action-card-hover)] active:bg-malibu-blue/80 active:scale-[0.98] p-6 items-center justify-center gap-3"
       >
         <div class="flex flex-col items-center gap-1 text-center">
           <h3
diff --git a/src/client/hud/layers/WinModal.ts b/src/client/hud/layers/WinModal.ts
index 7a290973da..cb522c2a28 100644
--- a/src/client/hud/layers/WinModal.ts
+++ b/src/client/hud/layers/WinModal.ts
@@ -1,4 +1,4 @@
-import { GameType, RankedType } from "@openfront/engine-api/game/GameTypes";
+import { GameType } from "@openfront/engine-api/game/GameTypes";
 import { GameUpdateType } from "@openfront/engine-api/game/GameUpdates";
 import type { AllPlayersStats, Winner } from "@openfront/engine-api/Schemas";
 import type { GameXpEligible, Progress } from "@openfront/shared/ApiSchemas";
@@ -31,6 +31,7 @@ import {
 } from "../../Cosmetics";
 import { isDesktopShell } from "../../DesktopShell";
 import { gamePortal } from "../../GamePortal";
+import type { MatchmakingMode } from "../../Matchmaking";
 import {
   gameShareMoment,
   momentShareLabel,
@@ -54,6 +55,7 @@ import {
   provisionalXpRules,
   reconcileXp,
 } from "../../ProvisionalXpAtDeath";
+import { requeueModeForRankedType } from "../../RequeueUrl";
 import { PlaySoundEffectEvent } from "../../sound/Sounds";
 import { steamSDK } from "../../SteamSDK";
 import { SendWinnerEvent } from "../../Transport";
@@ -104,8 +106,10 @@ export class WinModal extends LitElement implements Controller {
   @state()
   private isWin = false;
 
+  // The queue to rejoin from "Play Again"; null when the game has none (an
+  // unranked game, or a ranked FFA game, which has no queue any more).
   @state()
-  private isRankedGame = false;
+  private requeueMode: MatchmakingMode | null = null;
 
   @state()
   private patternContent: TemplateResult | null = null;
@@ -195,7 +199,7 @@ export class WinModal extends LitElement implements Controller {
             "exit",
           )}
           ${this.renderShare()}
-          ${this.isRankedGame
+          ${this.requeueMode !== null
             ? this.actionButton(
                 "main",
                 translateText("win_modal.requeue"),
@@ -306,9 +310,10 @@ export class WinModal extends LitElement implements Controller {
     if (url === null) return null;
     // Three labelled buttons fit side by side from md up; below that (and
     // beside a ranked game's requeue button) it takes a row of its own.
-    const placement = this.isRankedGame
-      ? "order-first basis-full"
-      : "order-first basis-full md:order-none md:basis-0 md:flex-1";
+    const placement =
+      this.requeueMode !== null
+        ? "order-first basis-full"
+        : "order-first basis-full md:order-none md:basis-0 md:flex-1";
     return html`<profile-share
       data-win-share
       class="flex ${placement}"
@@ -606,8 +611,9 @@ export class WinModal extends LitElement implements Controller {
 
   async show() {
     gamePortal.gameplayStop();
-    this.isRankedGame =
-      this.game.config().gameConfig().rankedType !== undefined;
+    this.requeueMode = requeueModeForRankedType(
+      this.game.config().gameConfig().rankedType,
+    );
     this.isVisible = true;
     this.requestUpdate();
     try {
@@ -929,23 +935,14 @@ export class WinModal extends LitElement implements Controller {
   }
 
   private _handleRequeue() {
+    if (this.requeueMode === null) return;
     this.hide();
     // Requeue for the same mode; Main owns the mechanism (currently a
     // reload with the requeue param, which reopens the queue after the
     // page teardown).
-    const rankedType = this.game.config().gameConfig().rankedType;
     document.dispatchEvent(
       new CustomEvent("matchmaking-requeue", {
-        detail: {
-          mode:
-            rankedType === RankedType.TwoVTwo
-              ? ("2v2" as const)
-              : rankedType === RankedType.FreeForAll
-                ? ("ffa" as const)
-                : rankedType === RankedType.ClanWars
-                  ? ("clanwars" as const)
-                  : ("1v1" as const),
-        },
+        detail: { mode: this.requeueMode },
       }),
     );
   }
diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts
index 115d44671a..c74fb279e9 100644
--- a/src/server/GameServer.ts
+++ b/src/server/GameServer.ts
@@ -4,7 +4,6 @@ import {
   HumansVsNations,
   PlayerInfo,
   PlayerType,
-  RANKED_FFA_MIN_PLAYERS,
   RankedType,
 } from "@openfront/engine-api/game/GameTypes";
 import { maps } from "@openfront/engine-api/game/Maps.gen";
@@ -888,12 +887,11 @@ export class GameServer {
   // Matchmade ranked games (1v1/2v2/clan wars) must start with full
   // attendance: the roster freezes at start(), so a game missing a player
   // would run short-handed only to be voided by the sim (2v2, clan wars) or
-  // hand out a walkover the absent player never contested (1v1). Ranked FFA
-  // starts without the missing players as long as RANKED_FFA_MIN_PLAYERS
-  // showed up, the fewest the API rates. Called at the start deadline;
-  // cancels the game and returns true when too few matched players connected.
+  // hand out a walkover the absent player never contested (1v1). Called at
+  // the start deadline; cancels the game and returns true when too few
+  // matched players connected.
   public cancelShortHandedMatch(): boolean {
-    // Explicitly 1v1/2v2/FFA/clan wars only — a future ranked type must opt
+    // Explicitly 1v1/2v2/clan wars only — a future ranked type must opt
     // in rather than inherit pre-start cancellation.
     const rankedType = this.gameConfig.rankedType;
     let expected: number | undefined;
@@ -903,8 +901,6 @@ export class GameServer {
       rankedType === RankedType.ClanWars
     ) {
       expected = this.gameConfig.maxPlayers;
-    } else if (rankedType === RankedType.FreeForAll) {
-      expected = RANKED_FFA_MIN_PLAYERS;
     } else {
       return false;
     }
diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts
index d4239875e0..e8899d74ec 100644
--- a/src/server/MapPlaylist.ts
+++ b/src/server/MapPlaylist.ts
@@ -9,7 +9,6 @@ import {
   HumansVsNations,
   PublicGameModifiers,
   Quads,
-  RANKED_FFA_MAX_PLAYERS,
   RankedType,
   Trios,
   UnitType,
@@ -565,44 +564,9 @@ export class MapPlaylist {
     } satisfies GameConfig;
   }
 
-  // maxPlayers is the most a match can have; the check-in lowers it to the
-  // size of the assigned match, so the game starts once everyone is in.
-  public getFfaConfig(): GameConfig {
-    const maps = [
-      GameMapType.Europe,
-      GameMapType.Asia,
-      GameMapType.Africa,
-      GameMapType.NorthAmerica,
-      GameMapType.SouthAmerica,
-      GameMapType.Australia,
-    ];
-    return {
-      donateGold: false,
-      donateTroops: false,
-      gameMap: maps[Math.floor(Math.random() * maps.length)],
-      maxPlayers: RANKED_FFA_MAX_PLAYERS,
-      gameType: GameType.Public,
-      gameMapSize: GameMapSize.Normal,
-      difficulty: Difficulty.Medium, // Doesn't matter, nations are disabled
-      rankedType: RankedType.FreeForAll,
-      infiniteGold: false,
-      infiniteTroops: false,
-      maxTimerValue: 20,
-      instantBuild: false,
-      randomSpawn: false,
-      nations: "disabled",
-      gameMode: GameMode.FFA,
-      bots: 400,
-      spawnImmunityDuration: 30 * 10,
-      disabledUnits: [],
-      // Same as public FFA: no tags to rally a clan around.
-      disableClanTags: true,
-    } satisfies GameConfig;
-  }
-
   // A clan wars match is teamCount clans of playerCount / teamCount players
   // each (2v2 up to four teams of 5). Small matches play the ranked 2v2 maps;
-  // bigger ones the continent maps ranked FFA uses.
+  // bigger ones the continent maps.
   public getClanWarsConfig(teamCount: number, playerCount: number): GameConfig {
     const small = playerCount <= 6;
     const maps = small
diff --git a/src/server/RankedCheckin.ts b/src/server/RankedCheckin.ts
index 25065f9abb..3790b83241 100644
--- a/src/server/RankedCheckin.ts
+++ b/src/server/RankedCheckin.ts
@@ -24,7 +24,8 @@ import { ServerEnv } from "./ServerEnv";
 // Games already assigned or running are untouched by this: the gate only
 // decides whether to make a NEW offer.
 
-export type RankedMode = "1v1" | "2v2" | "ffa" | "clanwars";
+export const RANKED_MODES = ["1v1", "2v2", "clanwars"] as const;
+export type RankedMode = (typeof RANKED_MODES)[number];
 
 // How long a single check-in may hang before we abort and come round again.
 // The endpoint is a long poll, so a request pending for most of this is the
@@ -225,23 +226,11 @@ export async function rankedCheckinPass(
         return;
       }
       const baseConfig =
-        mode === "ffa"
-          ? playlist.getFfaConfig()
-          : mode === "2v2"
-            ? playlist.get2v2Config()
-            : playlist.get1v1Config();
+        mode === "2v2" ? playlist.get2v2Config() : playlist.get1v1Config();
       const game = gm.createGame(
         gameId,
         parsed.success
-          ? {
-              ...baseConfig,
-              allowedPublicIds: parsed.data.players,
-              // An FFA match is 4 to 10 players: size the lobby to this one
-              // so it starts as soon as they are all in.
-              ...(mode === "ffa"
-                ? { maxPlayers: parsed.data.players.length }
-                : {}),
-            }
+          ? { ...baseConfig, allowedPublicIds: parsed.data.players }
           : baseConfig,
         undefined,
         Date.now() + MATCH_START_DEADLINE_MS,
@@ -302,7 +291,7 @@ function createClanWarsGame(
  */
 export function startRankedCheckinLoops(deps: RankedCheckinDeps): void {
   const gate = new RankedCheckinGate(deps.isActive, deps.log);
-  for (const mode of ["1v1", "2v2", "ffa", "clanwars"] as const) {
+  for (const mode of RANKED_MODES) {
     startPolling(
       async () => rankedCheckinPass(mode, gate, deps),
       CHECKIN_INTERVAL_MS + Math.random() * CHECKIN_JITTER_MS,
diff --git a/tests/client/Matchmaking.test.ts b/tests/client/Matchmaking.test.ts
index aeb449c46f..d210cf735e 100644
--- a/tests/client/Matchmaking.test.ts
+++ b/tests/client/Matchmaking.test.ts
@@ -1,5 +1,9 @@
 import type { UserMeResponse } from "@openfront/shared/ApiSchemas";
-import { CloseCode, CloseReason } from "@openfront/shared/CloseCodes";
+import {
+  CloseCode,
+  CloseReason,
+  isTerminalClose,
+} from "@openfront/shared/CloseCodes";
 import type { Mock } from "vitest";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -521,6 +525,15 @@ describe("MatchmakingModal trust gate", () => {
     expect(notTrusted(modal)).toBe(true);
     expect(sockets).toHaveLength(1);
   });
+
+  it("stops without reconnecting when the service says the mode is retired", async () => {
+    apiMocks.getUserMe.mockResolvedValue(withTrust("trusted"));
+    const { socket } = await openAndJoin("1v1");
+    socket.serverClose(CloseCode.ModeRetired, CloseReason.ModeRetired);
+    await vi.runAllTimersAsync();
+    expect(sockets).toHaveLength(1);
+    expect(isTerminalClose(CloseCode.ModeRetired)).toBe(true);
+  });
 });
 
 /**
diff --git a/tests/client/RankedModalTrust.test.ts b/tests/client/RankedModalTrust.test.ts
index fb3be8fa73..1276993d1a 100644
--- a/tests/client/RankedModalTrust.test.ts
+++ b/tests/client/RankedModalTrust.test.ts
@@ -76,18 +76,23 @@ describe("RankedModal trust lock", () => {
 
   it("shows a green open lock on every ranked card for a trusted account", async () => {
     const locks = await openWith(userMe("trusted"));
-    expect(locks).toHaveLength(4);
+    expect(locks).toHaveLength(3);
     for (const lock of locks) {
       expect(lock.dataset.trust).toBe("unlocked");
       expect(lock.classList.contains("text-green-400")).toBe(true);
     }
   });
 
+  it("has no FFA card", async () => {
+    await openWith(userMe("trusted"));
+    expect(modal.textContent).not.toContain("mode_selector.ranked_ffa_title");
+  });
+
   it.each(["untrusted", null, undefined] as const)(
     "shows a red closed lock when the tier is %s",
     async (tier) => {
       const locks = await openWith(userMe(tier));
-      expect(locks).toHaveLength(4);
+      expect(locks).toHaveLength(3);
       for (const lock of locks) {
         expect(lock.dataset.trust).toBe("locked");
         expect(lock.classList.contains("text-red-400")).toBe(true);
@@ -101,7 +106,6 @@ describe("RankedModal trust lock", () => {
       "locked",
       "locked",
       "locked",
-      "locked",
     ]);
   });
 
@@ -114,7 +118,7 @@ describe("RankedModal trust lock", () => {
     resolve(userMe("trusted"));
     await vi.waitFor(async () => {
       await modal.updateComplete;
-      expect(modal.querySelectorAll("[data-trust]")).toHaveLength(4);
+      expect(modal.querySelectorAll("[data-trust]")).toHaveLength(3);
     });
   });
 
@@ -162,7 +166,7 @@ describe("RankedModal trust lock", () => {
       await modal.updateComplete;
     }
 
-    it.each([0, 1, 2, 3])(
+    it.each([0, 1, 2])(
       "shows the ranked trust popup for an untrusted account (card %i)",
       async (index) => {
         await openWith(userMe("untrusted"));
@@ -185,8 +189,7 @@ describe("RankedModal trust lock", () => {
     it.each([
       [0, "1v1"],
       [1, "2v2"],
-      [2, "ffa"],
-      [3, "clanwars"],
+      [2, "clanwars"],
     ] as const)(
       "opens matchmaking for a trusted account (card %i, %s)",
       async (index, mode) => {
diff --git a/tests/client/RequeueUrl.test.ts b/tests/client/RequeueUrl.test.ts
new file mode 100644
index 0000000000..c3c9a97954
--- /dev/null
+++ b/tests/client/RequeueUrl.test.ts
@@ -0,0 +1,61 @@
+import { RankedType } from "@openfront/engine-api/game/GameTypes";
+import { describe, expect, it, vi } from "vitest";
+import {
+  consumeRequeueUrl,
+  requeueModeForRankedType,
+  requeueModeFromParam,
+} from "../../src/client/RequeueUrl";
+
+const loc = (search: string, hash = "") => ({ search, pathname: "/", hash });
+
+describe("requeueModeFromParam", () => {
+  it.each([
+    ["", "1v1"],
+    ["2v2", "2v2"],
+    ["clanwars", "clanwars"],
+    ["bogus", "1v1"],
+  ] as const)("maps %j to %s", (param, mode) => {
+    expect(requeueModeFromParam(param)).toBe(mode);
+  });
+
+  it("does not requeue ranked FFA, whose queue is gone", () => {
+    expect(requeueModeFromParam("ffa")).toBeNull();
+  });
+});
+
+describe("consumeRequeueUrl", () => {
+  it("leaves a URL without the param alone", () => {
+    const replace = vi.fn();
+    expect(consumeRequeueUrl(loc("?foo=1"), replace)).toBeNull();
+    expect(replace).not.toHaveBeenCalled();
+  });
+
+  it("?requeue=ffa opens no matchmaking, not 1v1, and still strips the param", () => {
+    const replace = vi.fn();
+    expect(
+      consumeRequeueUrl(loc("?requeue=ffa&foo=1", "#x"), replace),
+    ).toBeNull();
+    expect(replace).toHaveBeenCalledWith("/?foo=1#x");
+  });
+
+  it("keeps a bare ?requeue as 1v1", () => {
+    const replace = vi.fn();
+    expect(consumeRequeueUrl(loc("?requeue"), replace)).toBe("1v1");
+    expect(replace).toHaveBeenCalledWith("/");
+  });
+});
+
+describe("requeueModeForRankedType", () => {
+  it.each([
+    [RankedType.OneVOne, "1v1"],
+    [RankedType.TwoVTwo, "2v2"],
+    [RankedType.ClanWars, "clanwars"],
+  ] as const)("requeues %s as %s", (rankedType, mode) => {
+    expect(requeueModeForRankedType(rankedType)).toBe(mode);
+  });
+
+  it("offers no requeue for ranked FFA or an unranked game", () => {
+    expect(requeueModeForRankedType(RankedType.FreeForAll)).toBeNull();
+    expect(requeueModeForRankedType(undefined)).toBeNull();
+  });
+});
diff --git a/tests/client/graphics/layers/WinModal.test.ts b/tests/client/graphics/layers/WinModal.test.ts
index a3f2af4e25..32da85ae2b 100644
--- a/tests/client/graphics/layers/WinModal.test.ts
+++ b/tests/client/graphics/layers/WinModal.test.ts
@@ -1,4 +1,4 @@
-import { RankedType } from "@openfront/engine-api/game/GameTypes";
+import { GameType, RankedType } from "@openfront/engine-api/game/GameTypes";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { PurchaseButton } from "../../../../src/client/components/PurchaseButton";
 import {
@@ -8,6 +8,7 @@ import {
 } from "../../../../src/client/Cosmetics";
 import "../../../../src/client/hud/layers/WinModal";
 import type { WinModal } from "../../../../src/client/hud/layers/WinModal";
+import type { GameView } from "../../../../src/client/view";
 
 vi.mock("../../../../src/client/Utils", () => ({
   translateText: vi.fn((key: string) => {
@@ -77,24 +78,6 @@ describe("WinModal Requeue", () => {
     vi.restoreAllMocks();
   });
 
-  describe("isRankedGame detection", () => {
-    it("should detect ranked 1v1 game", () => {
-      const gameConfig = {
-        rankedType: RankedType.OneVOne,
-      };
-      const isRankedGame = gameConfig.rankedType === RankedType.OneVOne;
-      expect(isRankedGame).toBe(true);
-    });
-
-    it("should not detect non-ranked game", () => {
-      const gameConfig = {
-        rankedType: undefined,
-      };
-      const isRankedGame = gameConfig.rankedType === RankedType.OneVOne;
-      expect(isRankedGame).toBe(false);
-    });
-  });
-
   describe("requeue navigation", () => {
     it("should navigate to /?requeue when requeue is triggered", () => {
       // Simulate the _handleRequeue behavior
@@ -134,6 +117,54 @@ describe("WinModal Requeue", () => {
   });
 });
 
+describe("WinModal Play Again", () => {
+  const stubGame = (rankedType?: RankedType) =>
+    ({
+      config: () => ({
+        gameConfig: () => ({ rankedType, gameType: GameType.Public }),
+        isReplay: () => false,
+      }),
+      myPlayer: () => null,
+    }) as unknown as GameView;
+
+  async function shownWith(rankedType?: RankedType): Promise<WinModal> {
+    const modal = document.createElement("win-modal") as WinModal;
+    modal.game = stubGame(rankedType);
+    document.body.appendChild(modal);
+    await modal.show();
+    await modal.updateComplete;
+    return modal;
+  }
+
+  it("offers no Play Again after a ranked FFA game", async () => {
+    const modal = await shownWith(RankedType.FreeForAll);
+    expect(modal.querySelector('[data-win-action="requeue"]')).toBeNull();
+    modal.remove();
+  });
+
+  it.each([
+    [RankedType.OneVOne, "1v1"],
+    [RankedType.TwoVTwo, "2v2"],
+    [RankedType.ClanWars, "clanwars"],
+  ] as const)("requeues a ranked %s game as %s", async (rankedType, mode) => {
+    const modal = await shownWith(rankedType);
+    const requeue = vi.fn();
+    document.addEventListener("matchmaking-requeue", requeue);
+    modal
+      .querySelector<HTMLButtonElement>('[data-win-action="requeue"]')!
+      .click();
+    expect(requeue.mock.calls[0][0].detail).toEqual({ mode });
+    document.removeEventListener("matchmaking-requeue", requeue);
+    modal.remove();
+  });
+
+  it("offers no Play Again after an unranked game", async () => {
+    const modal = await shownWith(undefined);
+    expect(modal.querySelector('[data-win-action="requeue"]')).toBeNull();
+    modal.remove();
+  });
+});
+
 describe("WinModal pattern promotion", () => {
   let modal: WinModal | undefined;
 
diff --git a/tests/server/MatchmakingCancel.test.ts b/tests/server/MatchmakingCancel.test.ts
index 411ffc5df5..2e127f0cb1 100644
--- a/tests/server/MatchmakingCancel.test.ts
+++ b/tests/server/MatchmakingCancel.test.ts
@@ -74,22 +74,12 @@ describe("GameServer - short-handed matchmade game cancellation", () => {
     expect(game.phase()).not.toBe(GamePhase.Finished);
   });
 
-  it("cancels an FFA game with fewer than four players connected", () => {
+  it("leaves a ranked FFA game left over from before the queue closed to start", () => {
     const game = makeRankedGame(RankedType.FreeForAll, 6);
     for (const id of ["1", "2", "3"]) {
       expect(game.joinClient(makeClient(`c${id}`, `p${id}`))).toBe("joined");
     }
 
-    expect(game.cancelShortHandedMatch()).toBe(true);
-    expect(game.phase()).toBe(GamePhase.Finished);
-  });
-
-  it("starts an FFA game without its no-shows once four are connected", () => {
-    const game = makeRankedGame(RankedType.FreeForAll, 6);
-    for (const id of ["1", "2", "3", "4"]) {
-      expect(game.joinClient(makeClient(`c${id}`, `p${id}`))).toBe("joined");
-    }
-
     expect(game.cancelShortHandedMatch()).toBe(false);
     expect(game.phase()).not.toBe(GamePhase.Finished);
   });
diff --git a/tests/server/RankedCheckin.test.ts b/tests/server/RankedCheckin.test.ts
index b9eebc6c91..64e9ba9c46 100644
--- a/tests/server/RankedCheckin.test.ts
+++ b/tests/server/RankedCheckin.test.ts
@@ -1,13 +1,17 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { startPolling } from "../../src/server/PollingLoop";
 import {
   RANKED_PAUSED_LOG,
   RANKED_RESUMED_LOG,
   RankedCheckinGate,
   rankedCheckinPass,
+  startRankedCheckinLoops,
   type RankedCheckinDeps,
 } from "../../src/server/RankedCheckin";
 import { mockLogger } from "../util/GameServerHarness";
 
+vi.mock("../../src/server/PollingLoop", () => ({ startPolling: vi.fn() }));
+
 // OPE-469: a draining deployment kept offering ranked matches, so players on
 // the new build were matched onto the old one, bounced on version_mismatch,
 // and the match cancelled short-handed. The ranked check-in must follow the
@@ -32,9 +36,6 @@ function makeDeps(
     playlist: {
       get1v1Config: vi.fn().mockReturnValue({ gameMap: "Europe" }),
       get2v2Config: vi.fn().mockReturnValue({ gameMap: "Europe" }),
-      getFfaConfig: vi
-        .fn()
-        .mockReturnValue({ gameMap: "Europe", maxPlayers: 10 }),
       getClanWarsConfig: vi.fn().mockReturnValue({ gameMap: "Europe" }),
     } as any,
     workerId: 0,
@@ -118,6 +119,21 @@ describe("rankedCheckinPass", () => {
     vi.unstubAllEnvs();
   });
 
+  it("runs one check-in loop per ranked queue, with no FFA queue", async () => {
+    const fetchFn = okFetch({ assignment: null });
+    const deps = makeDeps(() => true, fetchFn);
+    startRankedCheckinLoops(deps);
+    const tasks = vi.mocked(startPolling).mock.calls.map(([task]) => task);
+    expect(tasks).toHaveLength(3);
+    for (const task of tasks) await task();
+    const modes = vi
+      .mocked(fetchFn)
+      .mock.calls.map(
+        ([, init]) => JSON.parse(String((init as RequestInit).body)).mode,
+      );
+    expect(modes).toEqual(["1v1", "2v2", "clanwars"]);
+  });
+
   it("checks in when active", async () => {
     const fetchFn = okFetch({ assignment: null });
     const deps = makeDeps(() => true, fetchFn);
@@ -261,22 +277,6 @@ describe("rankedCheckinPass", () => {
     expect(call[5]).toEqual([["p1"], ["p2"]]);
   });
 
-  it("sizes an FFA game to the players it was assigned", async () => {
-    const players = ["p1", "p2", "p3", "p4", "p5"];
-    const fetchFn = okFetch({
-      assignment: { players, teams: players.map((p) => [p]) },
-    });
-    const deps = makeDeps(() => true, fetchFn);
-    const gate = new RankedCheckinGate(deps.isActive, deps.log);
-
-    await rankedCheckinPass("ffa", gate, deps);
-
-    const [, init] = vi.mocked(fetchFn).mock.calls[0];
-    expect(JSON.parse(String((init as RequestInit).body)).mode).toBe("ffa");
-    const call = vi.mocked(deps.gm.createGame).mock.calls[0];
-    expect(call[1]).toMatchObject({ allowedPublicIds: players, maxPlayers: 5 });
-  });
-
   it("builds a clan wars game from its teams and clan tags", async () => {
     const teams = [
       ["a1", "a2"],