diff --git a/core/websocket/src/main/java/org/phoebus/core/websocket/WebSocketClient.java b/core/websocket/src/main/java/org/phoebus/core/websocket/WebSocketClient.java index ef51e31ce7..5d7d8242db 100644 --- a/core/websocket/src/main/java/org/phoebus/core/websocket/WebSocketClient.java +++ b/core/websocket/src/main/java/org/phoebus/core/websocket/WebSocketClient.java @@ -178,7 +178,11 @@ public CompletionStage onText(WebSocket webSocket, */ public void close(String reason) { keepPinging.set(false); - webSocket.sendClose(1000, reason); + attemptReconnect.set(false); + // webSocket is null if never connected + if(webSocket != null){ + webSocket.sendClose(1000, reason); + } } /**