Fix websocket server with server/channel changes