diff --git a/src/client/JoinLobbyModal.ts b/src/client/JoinLobbyModal.ts
index 20e0e79b0..59ee5b48a 100644
--- a/src/client/JoinLobbyModal.ts
+++ b/src/client/JoinLobbyModal.ts
@@ -55,6 +55,10 @@ export class JoinLobbyModal extends BaseModal {
   private countdownTimerId: number | null = null;
   private handledJoinTimeout = false;
 
+  private isPrivateLobby(): boolean {
+    return this.gameConfig?.gameType === GameType.Private;
+  }
+
   private readonly handleLobbyInfo = (event: LobbyInfoEvent) => {
     const lobby = event.lobby;
     if (!this.currentLobbyId || lobby.gameID !== this.currentLobbyId) {
@@ -91,6 +95,9 @@ export class JoinLobbyModal extends BaseModal {
           : translateText("public_lobby.started");
     const maxPlayers = this.gameConfig?.maxPlayers ?? 0;
     const playerCount = this.playerCount;
+    const hostClientID = this.isPrivateLobby()
+      ? (this.lobbyCreatorClientID ?? "")
+      : "";
     const content = html`
       <div
         class="h-full flex flex-col bg-black/60 backdrop-blur-md rounded-2xl border border-white/10 overflow-hidden select-none"
@@ -100,8 +107,7 @@ export class JoinLobbyModal extends BaseModal {
           onBack: () => this.closeAndLeave(),
           ariaLabel: translateText("common.close"),
           rightContent:
-            this.currentLobbyId &&
-            this.gameConfig?.gameType === GameType.Private
+            this.currentLobbyId && this.isPrivateLobby()
               ? html`
                   <copy-button .lobbyId=${this.currentLobbyId}></copy-button>
                 `
@@ -129,7 +135,7 @@ export class JoinLobbyModal extends BaseModal {
                         class="mt-6"
                         .gameMode=${this.gameConfig?.gameMode ?? GameMode.FFA}
                         .clients=${this.players}
-                        .lobbyCreatorClientID=${this.lobbyCreatorClientID}
+                        .lobbyCreatorClientID=${hostClientID}
                         .currentClientID=${this.currentClientID}
                         .teamCount=${this.gameConfig?.playerTeams ?? 2}
                         .nationCount=${this.nationCount}
@@ -143,7 +149,7 @@ export class JoinLobbyModal extends BaseModal {
               `}
         </div>
 
-        ${this.gameConfig?.gameType === GameType.Private
+        ${this.isPrivateLobby()
           ? html`
               <div
                 class="p-6 pt-4 border-t border-white/10 bg-black/20 shrink-0"
@@ -533,7 +539,6 @@ export class JoinLobbyModal extends BaseModal {
     if (lobby.clients) {
       this.players = lobby.clients;
       this.playerCount = lobby.clients.length;
-      this.lobbyCreatorClientID = lobby.clients[0]?.clientID ?? null;
     } else {
       this.players = [];
       this.playerCount = lobby.numClients ?? 0;
@@ -551,6 +556,10 @@ export class JoinLobbyModal extends BaseModal {
         this.loadNationCount();
       }
     }
+
+    this.lobbyCreatorClientID = this.isPrivateLobby()
+      ? (lobby.clients?.[0]?.clientID ?? null)
+      : null;
   }
 
   private startLobbyUpdates() {