diff --git a/resources/lang/en.json b/resources/lang/en.json
index d1cfe0f78..e3679dbe4 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -145,7 +145,8 @@
   },
   "public_lobby": {
     "join": "Join next Game",
-    "waiting": "players waiting"
+    "waiting": "players waiting",
+    "teams": "Team count:"
   },
   "username": {
     "enter_username": "Enter your username",
diff --git a/resources/lang/ja.json b/resources/lang/ja.json
index a268941c9..b88aa456f 100644
--- a/resources/lang/ja.json
+++ b/resources/lang/ja.json
@@ -137,7 +137,8 @@
   },
   "public_lobby": {
     "join": "次のゲームに参加",
-    "waiting": "人が参加しています..."
+    "waiting": "人が参加しています...",
+    "teams": "チームの数:"
   },
   "username": {
     "enter_username": "ユーザー名を入力",
diff --git a/src/client/PublicLobby.ts b/src/client/PublicLobby.ts
index 9170ca22c..acb463c4a 100644
--- a/src/client/PublicLobby.ts
+++ b/src/client/PublicLobby.ts
@@ -94,6 +94,11 @@ export class PublicLobby extends LitElement {
     const playersRemainingBeforeMax =
       lobby.gameConfig.maxPlayers - lobby.numClients;
 
+    const teamCount =
+      lobby.gameConfig.gameMode === GameMode.Team
+        ? lobby.gameConfig.playerTeams || 0
+        : null;
+
     return html`
       <button
         @click=${() => this.lobbyClicked(lobby)}
@@ -130,6 +135,13 @@ export class PublicLobby extends LitElement {
                   ? translateText("game_mode.teams")
                   : translateText("game_mode.ffa")}
               </div>
+              ${teamCount !== null
+                ? html`
+                    <div class="text-md font-medium text-blue-100">
+                      ${translateText("public_lobby.teams")} ${teamCount}
+                    </div>
+                  `
+                : null}
             </div>
             <div class="flex flex-col items-center">
               <div class="text-md font-medium text-blue-100 mb-2">