diff --git a/src/core/Schemas.ts b/src/core/Schemas.ts
index 7b04fe0cc..aae6b60c1 100644
--- a/src/core/Schemas.ts
+++ b/src/core/Schemas.ts
@@ -374,7 +374,7 @@ export const PlayerSchema = z.object({
   clientID: ID,
   username: SafeString,
   flag: SafeString.optional(),
-  pattern: SafeString.nullable().optional(),
+  pattern: SafeString.nullable(),
 });
 
 export const GameStartInfoSchema = z.object({
@@ -446,7 +446,7 @@ export const ClientJoinMessageSchema = z.object({
   lastTurn: z.number(), // The last turn the client saw.
   username: SafeString,
   flag: SafeString.nullable(),
-  pattern: SafeString.nullable().optional(),
+  pattern: SafeString.nullable(),
 });
 
 export const ClientMessageSchema = z.union([
diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts
index b95584e65..505174986 100644
--- a/src/core/game/Game.ts
+++ b/src/core/game/Game.ts
@@ -304,7 +304,7 @@ export class PlayerInfo {
   public readonly clan: string | null;
 
   constructor(
-    public readonly pattern: string | null | undefined,
+    public readonly pattern: string | null,
     public readonly flag: string | undefined,
     public readonly name: string,
     public readonly playerType: PlayerType,
diff --git a/src/core/game/GameUpdates.ts b/src/core/game/GameUpdates.ts
index db2336e7e..05e9c6473 100644
--- a/src/core/game/GameUpdates.ts
+++ b/src/core/game/GameUpdates.ts
@@ -93,7 +93,7 @@ export interface PlayerUpdate {
   type: GameUpdateType.Player;
   nameViewData?: NameViewData;
   clientID: ClientID | null;
-  pattern: string | undefined | null;
+  pattern: string | null;
   flag: string | undefined;
   name: string;
   displayName: string;
diff --git a/src/core/game/GameView.ts b/src/core/game/GameView.ts
index 1d100577b..e3fd02e23 100644
--- a/src/core/game/GameView.ts
+++ b/src/core/game/GameView.ts
@@ -172,7 +172,7 @@ export class PlayerView {
     return this.data.flag;
   }
 
-  pattern(): string | undefined | null {
+  pattern(): string | null {
     return this.data.pattern;
   }
 
diff --git a/src/core/game/PlayerImpl.ts b/src/core/game/PlayerImpl.ts
index d6c0de537..90ce46dcd 100644
--- a/src/core/game/PlayerImpl.ts
+++ b/src/core/game/PlayerImpl.ts
@@ -80,7 +80,7 @@ export class PlayerImpl implements Player {
   public _units: Unit[] = [];
   public _tiles: Set<TileRef> = new Set();
 
-  private _pattern: string | undefined | null;
+  private _pattern: string | null;
   private _flag: string | undefined;
   private _name: string;
   private _displayName: string;
@@ -180,7 +180,7 @@ export class PlayerImpl implements Player {
     return this._smallID;
   }
 
-  pattern(): string | undefined | null {
+  pattern(): string | null {
     return this._pattern;
   }
 
diff --git a/src/server/Client.ts b/src/server/Client.ts
index 1a5d645cf..6d39347e9 100644
--- a/src/server/Client.ts
+++ b/src/server/Client.ts
@@ -19,6 +19,6 @@ export class Client {
     public readonly username: string,
     public readonly ws: WebSocket,
     public readonly flag: string | null,
-    public readonly pattern: string | undefined | null,
+    public readonly pattern: string | null,
   ) {}
 }