diff --git a/dinky-admin/src/main/java/org/dinky/ws/GlobalWebSocket.java b/dinky-admin/src/main/java/org/dinky/ws/GlobalWebSocket.java
index 9d94b3872f..68a994d221 100644
--- a/dinky-admin/src/main/java/org/dinky/ws/GlobalWebSocket.java
+++ b/dinky-admin/src/main/java/org/dinky/ws/GlobalWebSocket.java
@@ -94,7 +94,9 @@ public enum EventType {
     private static final Map<Session, RequestDTO> TOPICS = new ConcurrentHashMap<>();
 
     @OnOpen
-    public void onOpen(Session session) {}
+    public void onOpen(Session session) {
+        session.setMaxIdleTimeout(30000);
+    }
 
     @OnClose
     public void onClose(Session session) {
diff --git a/dinky-web/src/models/UseWebSocketModel.tsx b/dinky-web/src/models/UseWebSocketModel.tsx
index 677534eb36..2344fd2e73 100644
--- a/dinky-web/src/models/UseWebSocketModel.tsx
+++ b/dinky-web/src/models/UseWebSocketModel.tsx
@@ -59,7 +59,7 @@ export default () => {
   const ws = useRef<WebSocket>();
 
   const reconnect = () => {
-    if (ws.current && ws.current.readyState === WebSocket.CLOSED) {
+    if (ws.current && ws.current.readyState === WebSocket.OPEN) {
       ws.current.close();
     }
     ws.current = new WebSocket(wsUrl);