This is a good suggestion, but the S7 clickbox comes lubed, and flooding it with WD40 (which, despite being used as such far too many times) is itself not a (lasting) lubricant - it will most likely thin or even wash out the grease used in the clickbox, increasing wear and reducing the lifetime of the internal mechanism.
If OP is fine with disassembling the clickbox, spraying it with WD40 to displace the water would be an excellent first step in a repair though. I’d then clean and re-lube the mechanism before reassembling and sealing it.
However, I assume OP is asking to keep the clickbox untouched, as it can be somewhat of a nuisance to reassemble.