diff --git a/apps/api/src/server.ts b/apps/api/src/server.ts
index c2b6d34..2cdeb0e 100644
--- a/apps/api/src/server.ts
+++ b/apps/api/src/server.ts
@@ -9,6 +9,6 @@ const server = createServer(app);
 
 setupWebSocket(server);
 
-app.listen(PORT, () => {
+server.listen(PORT, () => {
   console.log(`Server listening on port ${PORT}`);
 });
diff --git a/apps/api/src/services/lobbyService.ts b/apps/api/src/services/lobbyService.ts
index 3e307ef..985b776 100644
--- a/apps/api/src/services/lobbyService.ts
+++ b/apps/api/src/services/lobbyService.ts
@@ -28,7 +28,9 @@ export const createLobby = async (hostUserId: string): Promise<Lobby> => {
   for (let i = 0; i < MAX_CODE_ATTEMPTS; i++) {
     const code = generateLobbyCode();
     try {
-      return await createLobbyModel(code, hostUserId);
+      const lobby = await createLobbyModel(code, hostUserId);
+      await addPlayer(lobby.id, hostUserId, MAX_LOBBY_PLAYERS);
+      return lobby;
     } catch (err) {
       if (isUniqueViolation(err)) continue;
       throw err;
diff --git a/apps/web/src/lib/ws-client.ts b/apps/web/src/lib/ws-client.ts
index f1da6cc..2925a58 100644
--- a/apps/web/src/lib/ws-client.ts
+++ b/apps/web/src/lib/ws-client.ts
@@ -25,6 +25,14 @@ export class WsClient {
   public onClose: ((event: CloseEvent) => void) | null = null;
 
   connect(apiUrl: string): Promise<void> {
+    // If already connected or connecting, resolve immediately
+    if (
+      this.ws &&
+      (this.ws.readyState === WebSocket.OPEN ||
+        this.ws.readyState === WebSocket.CONNECTING)
+    ) {
+      return Promise.resolve();
+    }
     return new Promise((resolve, reject) => {
       if (this.ws) {
         this.ws.close();
diff --git a/apps/web/src/lib/ws-provider.tsx b/apps/web/src/lib/ws-provider.tsx
index 1b34bd6..b4a56d3 100644
--- a/apps/web/src/lib/ws-provider.tsx
+++ b/apps/web/src/lib/ws-provider.tsx
@@ -9,6 +9,8 @@ export const WsProvider = ({ children }: { children: ReactNode }) => {
   const [isConnected, setIsConnected] = useState(false);
 
   const connect = useCallback(async (url: string): Promise<void> => {
+    if (wsClient.isConnected()) return;
+
     wsClient.onClose = () => setIsConnected(false);
     wsClient.onError = () => setIsConnected(false);
     try {