diff --git a/v2/internal/frontend/devserver/devserver.go b/v2/internal/frontend/devserver/devserver.go
index 638c6bd40..96f18fcd0 100644
--- a/v2/internal/frontend/devserver/devserver.go
+++ b/v2/internal/frontend/devserver/devserver.go
@@ -306,6 +306,10 @@ func (d *DevWebServer) broadcast(message string) {
 	d.socketMutex.Lock()
 	defer d.socketMutex.Unlock()
 	for client := range d.websocketClients {
+		if client == nil {
+			d.logger.Error("Lost connection to websocket server")
+			return
+		}
 		err := client.WriteMessage(websocket.TextMessage, []byte(message))
 		if err != nil {
 			d.logger.Error(err.Error())