My Fenix 7x 51mm solar freezes if used in water

I've used my Fenix 7x for tracking a few things including windsurfing and it's been fine, just what I need. However twice recently I've used it while swimming and both times the watch face has just frozen completely, no buttons clear it. The torch function still works but I can't do anything to use the watch usefully for an hour or so until it sorts itself out. It is 13 months old, am I likely to be able to make a warranty claim for this?