Fix bad behavor while pinging Clients

fixes #6941
No, the order of the conditionals between the `&&` decides that.