diff --git a/client/src/components/Guess.tsx b/client/src/components/Guess.tsx
index 24f80ce..cc9dd4e 100644
--- a/client/src/components/Guess.tsx
+++ b/client/src/components/Guess.tsx
@@ -13,13 +13,6 @@ const Guess = ({sendJsonMessage, players, answers, currentPlayerId, playerId, pr
         setGuesses(copy);
     }
 
-    let disabled = true;
-    for (let guess of guesses) {
-        if (guess !== "none") {
-            disabled = false;
-        }
-    }
-
     const pickingPlayer = players.find((player:Player) => player.id === currentPlayerId);
     const isPicking = playerId === currentPlayerId;
     const playersWithoutSelf = players.filter((player:Player) => player.id !== playerId);
@@ -60,7 +53,7 @@ const Guess = ({sendJsonMessage, players, answers, currentPlayerId, playerId, pr
             </div>
 
             <div className='pt-4'>
-                <button className='button-orange p-1 pr-4 pl-4 disabled:opacity-50' disabled={disabled || !isPicking} onClick={submitGuess}><h4>
+                <button className='button-orange p-1 pr-4 pl-4 disabled:opacity-50' disabled={!isPicking} onClick={submitGuess}><h4>
                     {isPicking &&
                         "Submit Guess"
                     }    
diff --git a/server/src/util.ts b/server/src/util.ts
index 621b691..35d6560 100644
--- a/server/src/util.ts
+++ b/server/src/util.ts
@@ -439,7 +439,7 @@ function broadcastMessage(room: Room, type: string, data?: any) {
     for (let player of room.players) {
         if (player.disconnected) { continue }
         const client = connections[player.id];
-        if (client.readyState === WebSocket.OPEN) {
+        if (client !== undefined && client.readyState === WebSocket.OPEN) {
             const msgAdd = {...message, ...{playerId: player.id}};
             const toSend = JSON.stringify(msgAdd);
             client.send(toSend);