diff --git a/backend/api/websocket.go b/backend/api/websocket.go
index 629c41f..5a75abd 100644
--- a/backend/api/websocket.go
+++ b/backend/api/websocket.go
@@ -218,7 +218,7 @@ func onPlayerJoin(client *socketio.Socket, room *types.Room, player *types.Playe
 			// TODO: Handle empty card deck
 			return
 		}
-		game.OnPlayerStateUpdate(room, player, false)
+		game.UpdateAllPlayers(room)
 	})
 
 	client.On("PlayCard", func(datas ...any) {
diff --git a/frontend/src/views/Game/Main.svelte b/frontend/src/views/Game/Main.svelte
index 45233d8..127ff83 100644
--- a/frontend/src/views/Game/Main.svelte
+++ b/frontend/src/views/Game/Main.svelte
@@ -32,7 +32,12 @@
         </div>
         <div class="center grid grid-cols-2">
             <div class="drawCard flex justify-center items-center">
-                <button class="draw" on:click={() => sessionStore.drawCard()}>
+                <button
+                    class="draw"
+                    on:click={() => {
+                        if (get(playerActive)) sessionStore.drawCard();
+                    }}
+                >
                     <svelte:component this={cardComponent} width={cardWidth} height={cardHeight} data={{ Color: "black", Symbol: "special:draw" }} />
                 </button>
             </div>