diff --git a/tank-frontend/src/Controls.tsx b/tank-frontend/src/Controls.tsx
index c709bab..d0c175d 100644
--- a/tank-frontend/src/Controls.tsx
+++ b/tank-frontend/src/Controls.tsx
@@ -58,6 +58,9 @@ export default function Controls({player}: { player: string }) {
         };
     }, [readyState]);
 
+    if (readyState != ReadyState.OPEN)
+        return <></>;
+
     return <div className="Controls flex-row">
         <div className="flex-column Controls-Container">
             <h3>Move</h3>
diff --git a/tank-frontend/src/MapChooser.tsx b/tank-frontend/src/MapChooser.tsx
index 00923e2..292802c 100644
--- a/tank-frontend/src/MapChooser.tsx
+++ b/tank-frontend/src/MapChooser.tsx
@@ -36,6 +36,9 @@ export default function MapChooser() {
         postMap.mutate(chosenMap);
     };
 
+    if (query.isError)
+        return <></>;
+
     const disabled = !query.isSuccess || postMap.isPending;
 
     return <select className="MapChooser-DropDown" onChange={onChange} disabled={disabled}>
diff --git a/tank-frontend/src/PlayerInfo.tsx b/tank-frontend/src/PlayerInfo.tsx
index d53b730..04e3457 100644
--- a/tank-frontend/src/PlayerInfo.tsx
+++ b/tank-frontend/src/PlayerInfo.tsx
@@ -57,7 +57,7 @@ export default function PlayerInfo({player}: { player: string }) {
         sendMessage('');
     }, [readyState, shouldSendMessage]);
 
-    if (!lastJsonMessage)
+    if (!lastJsonMessage || readyState !== ReadyState.OPEN)
         return <></>;
 
     return <Column className="PlayerInfo">