Watch freezing

I have a Forerunner 955 running software version 23.20.  I have noticed that after I take it off to charge it, when I put the watch back on, it freezes.  I can still hold the light button down to get it to shut down, eventually (has taken a while to get it to properly shut down before).  Seems to freeze about 30 s to 1 min after putting the watch back on.  I can power cycle to eventually get it working again, but sometimes have to power cycle multiple times and is rather time consuming.  Are there any solutions for this?