diff --git a/app/src/app.service.ts b/app/src/app.service.ts
index 6c489ba..eb7a29f 100644
--- a/app/src/app.service.ts
+++ b/app/src/app.service.ts
@@ -40,6 +40,10 @@ export class AppService implements OnGatewayConnection {
     @MessageBody() event: JoinLobbyEvent,
   ) {
     this.playerService.addUserName(client.id, event.userName);
+    this.gameService.joinGame(
+      this.playerService.getPlayer(client.id),
+      event.lobbyId,
+    );
     this.logger.log('Te has unido a un lobby');
   }
 }
diff --git a/app/src/games/game.service.ts b/app/src/games/game.service.ts
index 008d400..fa16796 100644
--- a/app/src/games/game.service.ts
+++ b/app/src/games/game.service.ts
@@ -12,7 +12,16 @@ export class GameService {
     const gameId = uuidv4();
     const gameCode = uuidv4().slice(-5).toUpperCase();
     const game: Game = new Game(gameId, gameCode, player);
-    this.games.set(gameId, game);
+    this.games.set(gameCode, game);
+    this.logger.log([...this.games.entries()]);
+  }
+
+  joinGame(player: Player, gameCode: string) {
+    const game = this.games.get(gameCode);
+    if (game === undefined) {
+      throw Error('No se ha encontrado el Lobby');
+    }
+    game.players.push(player);
     this.logger.log([...this.games.entries()]);
   }
 }