diff --git a/src/contexts/PartyContext.js b/src/contexts/PartyContext.js
index 37c3e32..1b90af7 100644
--- a/src/contexts/PartyContext.js
+++ b/src/contexts/PartyContext.js
@@ -15,14 +15,10 @@ export function PartyProvider({ session, children }) {
       }
     }
 
-    if (session.socket) {
-      session.socket.on("party_state", handleSocketPartyState);
-    }
+    session.socket?.on("party_state", handleSocketPartyState);
 
     return () => {
-      if (session.socket) {
-        session.socket.off("party_state", handleSocketPartyState);
-      }
+      session.socket?.off("party_state", handleSocketPartyState);
     };
   });
 
diff --git a/src/contexts/PlayerContext.js b/src/contexts/PlayerContext.js
index c3c1cca..1cf7b74 100644
--- a/src/contexts/PlayerContext.js
+++ b/src/contexts/PlayerContext.js
@@ -73,19 +73,13 @@ export function PlayerProvider({ session, children }) {
     }
 
     session.on("connected", handleSocketConnect);
-
-    if (session.socket) {
-      session.socket.on("connect", handleSocketConnect);
-      session.socket.on("reconnect", handleSocketConnect);
-    }
+    session.socket?.on("connect", handleSocketConnect);
+    session.socket?.on("reconnect", handleSocketConnect);
 
     return () => {
       session.off("connected", handleSocketConnect);
-
-      if (session.socket) {
-        session.socket.off("connect", handleSocketConnect);
-        session.socket.off("reconnect", handleSocketConnect);
-      }
+      session.socket?.off("connect", handleSocketConnect);
+      session.socket?.off("reconnect", handleSocketConnect);
     };
   });
 
diff --git a/src/helpers/useNetworkedState.js b/src/helpers/useNetworkedState.js
index 25741ce..eefbb75 100644
--- a/src/helpers/useNetworkedState.js
+++ b/src/helpers/useNetworkedState.js
@@ -23,13 +23,9 @@ function useNetworkedState(defaultState, session, eventName) {
       _setState(data);
     }
 
-    if (session.socket) {
-      session.socket.on(eventName, handleSocketEvent);
-    }
+    session.socket?.on(eventName, handleSocketEvent);
     return () => {
-      if (session.socket) {
-        session.socket.off(eventName, handleSocketEvent);
-      }
+      session.socket?.off(eventName, handleSocketEvent);
     };
   }, [session.socket, eventName]);
 
diff --git a/src/network/NetworkedMapAndTokens.js b/src/network/NetworkedMapAndTokens.js
index b5c61c1..e3eb650 100644
--- a/src/network/NetworkedMapAndTokens.js
+++ b/src/network/NetworkedMapAndTokens.js
@@ -174,9 +174,9 @@ function NetworkedMapAndTokens({ session }) {
 
     if (newMap && newMap.type === "file") {
       const { file, resolutions, ...rest } = newMap;
-      session.socket.emit("map", rest);
+      session.socket?.emit("map", rest);
     } else {
-      session.socket.emit("map", newMap);
+      session.socket?.emit("map", newMap);
     }
 
     if (!newMap || !newMapState) {
@@ -395,16 +395,12 @@ function NetworkedMapAndTokens({ session }) {
     }
     session.on("peerData", handlePeerData);
     session.on("peerDataProgress", handlePeerDataProgress);
-    if (session.socket) {
-      session.socket.on("map", handleSocketMap);
-    }
+    session.socket?.on("map", handleSocketMap);
 
     return () => {
       session.off("peerData", handlePeerData);
       session.off("peerDataProgress", handlePeerDataProgress);
-      if (session.socket) {
-        session.socket.off("map", handleSocketMap);
-      }
+      session.socket?.off("map", handleSocketMap);
     };
   });
 
diff --git a/src/network/NetworkedMapPointer.js b/src/network/NetworkedMapPointer.js
index 9494eba..aab6b32 100644
--- a/src/network/NetworkedMapPointer.js
+++ b/src/network/NetworkedMapPointer.js
@@ -114,12 +114,10 @@ function NetworkedMapPointer({ session, active, gridSize }) {
       }
     }
 
-    if (session.socket) {
-      session.socket.on("player_pointer", handleSocketPlayerPointer);
-    }
+    session.socket?.on("player_pointer", handleSocketPlayerPointer);
 
     return () => {
-      session.socket.off("player_pointer", handleSocketPlayerPointer);
+      session.socket?.off("player_pointer", handleSocketPlayerPointer);
     };
   }, [session]);