diff --git a/src/client/graphics/GameRenderer.ts b/src/client/graphics/GameRenderer.ts
index 28ddb7a7c..516409001 100644
--- a/src/client/graphics/GameRenderer.ts
+++ b/src/client/graphics/GameRenderer.ts
@@ -1,6 +1,7 @@
 import { EventBus } from "../../core/EventBus";
-import { GameView } from "../../core/game/GameView";
 import { GameMode, TeamGameType } from "../../core/game/Game";
+import { GameView } from "../../core/game/GameView";
+import { UserSettings } from "../../core/game/UserSettings";
 import { GameStartingModal } from "../GameStartingModal";
 import { RefreshGraphicsEvent as RedrawGraphicsEvent } from "../InputHandler";
 import { TransformHandler } from "./TransformHandler";
diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts
index 1b5a972af..b249954d2 100644
--- a/src/server/GameServer.ts
+++ b/src/server/GameServer.ts
@@ -3,7 +3,12 @@ import { Logger } from "winston";
 import WebSocket from "ws";
 import { z } from "zod";
 import { GameEnv, ServerConfig } from "../core/configuration/Config";
-import { GameMapType, GameMode, GameType } from "../core/game/Game";
+import {
+  GameMapType,
+  GameMode,
+  GameType,
+  TeamGameType,
+} from "../core/game/Game";
 import {
   ClientID,
   ClientMessageSchema,
@@ -130,7 +135,8 @@ export class GameServer {
     // Enforce Nuke Wars only on Baikal at server side.
     try {
       if (
-        this.gameConfig.gameMode === GameMode.NukeWars &&
+        this.gameConfig.gameMode === GameMode.Team &&
+        this.gameConfig.teamGameType === TeamGameType.NukeWars &&
         this.gameConfig.gameMap !== GameMapType.Baikal
       ) {
         this.log.warn(