diff --git a/photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java b/photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java
index 848c7a4475..69bbd92fea 100644
--- a/photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java
+++ b/photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java
@@ -69,8 +69,7 @@ private DataSocketHandler() {
 
     public void onConnect(WsConnectContext context) {
         users.add(context);
-        context.session.setIdleTimeout(
-                Duration.ofMillis(Long.MAX_VALUE)); // TODO: determine better value
+        context.session.setIdleTimeout(Duration.ofMillis(5000));
         var remote = (InetSocketAddress) context.session.getRemoteAddress();
         var host = remote.getAddress().toString() + ":" + remote.getPort();
         logger.info("New websocket connection from " + host);
diff --git a/photon-server/src/main/java/org/photonvision/server/Server.java b/photon-server/src/main/java/org/photonvision/server/Server.java
index c50fab873a..b202b85071 100644
--- a/photon-server/src/main/java/org/photonvision/server/Server.java
+++ b/photon-server/src/main/java/org/photonvision/server/Server.java
@@ -109,6 +109,7 @@ private static void start(int port) {
                 ws -> {
                     ws.onConnect(dsHandler::onConnect);
                     ws.onClose(dsHandler::onClose);
+                    ws.onError(e -> logger.error(e.toString(), e.error()));
                     ws.onBinaryMessage(dsHandler::onBinaryMessage);
                 });