diff --git a/src/server/Master.ts b/src/server/Master.ts
index 2e04c5afe..caade7bdd 100644
--- a/src/server/Master.ts
+++ b/src/server/Master.ts
@@ -163,7 +163,7 @@ app.get(
 async function fetchLobbies(): Promise<number> {
   const fetchPromises = [];
 
-  for (const gameID of publicLobbyIDs) {
+  for (const gameID of new Set(publicLobbyIDs)) {
     const controller = new AbortController();
     setTimeout(() => controller.abort(), 5000); // 5 second timeout
     const port = config.workerPort(gameID);
@@ -178,6 +178,7 @@ async function fetchLobbies(): Promise<number> {
       .catch((error) => {
         log.error(`Error fetching game ${gameID}:`, error);
         // Return null or a placeholder if fetch fails
+        publicLobbyIDs.delete(gameID);
         return null;
       });
 
diff --git a/src/server/gatekeeper b/src/server/gatekeeper
index 8324db940..1f14b7a52 160000
--- a/src/server/gatekeeper
+++ b/src/server/gatekeeper
@@ -1 +1 @@
-Subproject commit 8324db9408ce63097f750589bbea6b913127b60f
+Subproject commit 1f14b7a5261b2daee5ceb8728b571fa3bc152f63